KO
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
jhj
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
mnkjn
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
ghbj
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/mapDrawer/MapPanel.java
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
ugh
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/mapDrawer/FindRelevantNodes.java
	src/mapDrawer/ZoomLevel.java
ui
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/mapDrawer/ZoomLevel.java
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git
renamed every-fucking-thing

Signed-off-by: FrederikTH <Frederikhoffmann1@gmail.com>