menue bearbeitet
menue bearbeitet
Merge branch 'master' of https://github.com/Hildegard88/evctd

Conflicts:
	TowerDefense_1/Content/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TowerDefense_1/Content/obj/x86/Debug/ContentPipeline.xml
	TowerDefense_1/TowerDefense.suo
	TowerDefense_1/TowerDefense/Logik/Levelverwaltung.cs
	TowerDefense_1/TowerDefense/TowerDefense.csproj.Debug.cachefile
	TowerDefense_1/TowerDefense/bin/x86/Debug/GameStateManagementSample.exe
	TowerDefense_1/TowerDefense/bin/x86/Debug/GameStateManagementSample.pdb
	TowerDefense_1/TowerDefense/obj/x86/Debug/GameStateManagementSample.exe
	TowerDefense_1/TowerDefense/obj/x86/Debug/GameStateManagementSample.pdb
	TowerDefense_1/TowerDefense/obj/x86/Debug/TowerDefense.csproj.FileListAbsolute.txt
	TowerDefense_1/TowerDefense/obj/x86/Debug/cachefile-{B7219195-3990-4557-87D7-856DB165635D}-targetpath.txt