gmaps

skadsaffdsgs
Merge branch 'master' of https://github.com/xecor/Prosjekt1

Conflicts:
	src/application/Map.java