Have potholes and divvy markers added to the map. Can turn them on and off. This is f*ing awesome
stuff mostly works gooder now
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/controller.js
stuff mostly works gooder now