Merge branch 'master' of https://github.com/pixelpusher/web-mapping

Conflicts:
	projects/scavenger-hunt/clue-3/index.html
Hi

Hi