Displaying information on the map
Merge branch 'master' of github.com:TAOAppin59/appIn59-Practice

Conflicts:
	app/partials/map.html