Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  update index.md
  Add PR template to encourage clicking Allow Edits

docs/user-guide/configmap/index.md

@@ -498,7 +498,7 @@ When this pod is run, the output will be:
 
 ## Real World Example: Configuring Redis
 
-Let's take a look at a real-world example: configuring redis using ConfigMap.  Say we want to inject
+Let's take a look at a real-world example: configuring redis using ConfigMap.  Say that we want to inject
 redis with the recommendation configuration for using redis as a cache.  The redis config file
 should contain: