Remote from work
Merge branch 'gh-pages' of https://github.com/cmahlke/templates

Conflicts:
	extras/thumb_at.png
	extras/thumb_hotspots.png
	extras/thumb_mapDesign.png
	extras/thumb_nola.png
	extras/thumb_podRacerScreenshot.png