Signed-off-by: Jesper <jespernysteen@gmail.com>
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/gui/MapWindow.java
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git