deleted old mapview, made changes to new one
Merge branch 'master' of https://github.com/madpatter/introHCI

Conflicts:
	mapview.html
	public/mapview.html