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

Conflicts:
	XML/DjikstraTest.txt
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/inputHandler/AdressParser.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
sda
Merge branch 'master' of https://github.com/TeamAwesomeITU/FoersteAarsProjekt-V4.git

Conflicts:
	src/inputHandler/AddressSearch.java
	src/inputHandler/test/AddressParserTest.java