Updated README to match the one in "master"
Merge branch 'templates' into gh-pages
Merge branch 'templates'
Changed directory name to "templates" instead
Merge branch 'master' into gh-pages