noget der skal merges
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/mapDrawer/drawing/MapPanel.java
Signed-off-by: Jesper <jespernysteen@gmail.com>
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Nu kan den sgu vise vejnavn!
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git