Chi Lams commits
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/Release/GameStateManagementSample.exe
	TowerDefense_1/TowerDefense/bin/x86/Release/GameStateManagementSample.pdb
	TowerDefense_1/TowerDefense/obj/x86/Release/GameStateManagementSample.exe
	TowerDefense_1/TowerDefense/obj/x86/Release/GameStateManagementSample.pdb
commit
merge