Local editing
Merge branch 'master' of https://github.com/cheetah90/EnrouteTask

Conflicts:
	GoogleMapExample.html