Delete parking marker
Merge branch 'master' of https://github.com/jennywang971/OurParkingSpots

Conflicts:
	war/js/map.js