Smokerwhite
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/mapCreationAndFunctions/MapPanel.java