Add GPS tracking and path drawing to the map
Fix my own conflict

Conflicts:
	views/map.handlebars