throw away
Merge branch 'master' of https://github.com/EncyclopediaRed/map

Conflicts:
	index.html