Merge branch 'gh-pages' of https://github.com/dhcar/WhatsGood into gh-pages

Conflicts:
js/Maps.js
Merge branch 'gh-pages' of https://github.com/dhcar/WhatsGood into gh-pages

Conflicts:
	js/Maps.js