made selecting markers work
Merge branch 'master' of https://github.com/madpatter/introHCI
Merge branch 'master' of https://github.com/madpatter/introHCI
Merge branch 'master' of https://github.com/madpatter/introHCI
minor bugs
minor changes
fixed bug
Merge branch 'master' of https://github.com/madpatter/introHCI
json on server side is now being updated; changed some button css
Merge branch 'master' of https://github.com/madpatter/introHCI

Conflicts:
	public/mapview.html
added map styling and marker styling