Signed-off-by: Tobias Kristiansen <toea@itu.dk>
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/gui/MapPopUp.java