we have map now!
Merge branch 'master' of github.com:HistoryCampus/HistoryMap

Conflicts:
	index.html