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

Conflicts:
	TowerDefense_1/TowerDefense.suo
	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
Git Commit
git Commit
commit
Merge branch 'master' of https://github.com/Hildegard88/evctd

Conflicts:
	TowerDefense_1/TowerDefense.suo
	TowerDefense_1/TowerDefense/Screens/GameplayScreen.cs
	TowerDefense_1/TowerDefense/bin/x86/Debug/GameStateManagementSample.exe
	TowerDefense_1/TowerDefense/bin/x86/Debug/GameStateManagementSample.pdb
	TowerDefense_1/TowerDefense/obj/x86/Debug/GameStateManagementSample.exe
Zum Ziehen der daten einmal Committen
Mein Commit (Chi lam)
Merge branch 'master' of https://github.com/Hildegard88/evctd