Aufgabe 3, 1
Aufgabe 3
Merge branch 'master' into local

Conflicts:
	RoutePlannerLib/Cities.cs
Merge pull request #5 from Stolz77/local

Local