Back to Mia’s map
Merge branch 'master' of https://github.com/Grub0/GameDevTimeline

Conflicts:
	css/mapStyle.css
	index.html
	js/mapVis.js