first google maps version wip
Merge branch 'master' of github.com:ayecue/asds

Conflicts:
	frontend/index.html