Mathias commit
testy
Merge branch 'master' of https://github.com/MathiasLoewe/Awesomemap

Conflicts:
	src/graph/MyGraph.java
	src/gui/CreateGUI.java
	src/gui/DrawGraph.java
	src/util/DijkstraSP.java