Merge branch 'gh-pages'
quotes around key
Merge branch 'master' into gh-pages
update name to controulr
Merge branch 'master' into gh-pages