many revisions, getting closer to launch
Merge branch 'master' of https://github.com/MissingMaps/missingmaps.github.io

Conflicts:
	img/hot_logo.png