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

Conflicts:
	src/inputHandler/AddressSearch.java
	src/inputHandler/EdgeSearch.java
This commit is important as fuck
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git