Merging work into the intergrated
Merge fixes with Master
Update to the Zombieclass
555
sdd
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into weijie

Conflicts:
	DM2231_Lab2_MVC/DM2231_Lab2/Bullet.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/Bullet.h
	DM2231_Lab2_MVC/DM2231_Lab2/Collision.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/Collision.h
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Controller.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Lab2.vcxproj
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Lab2.vcxproj.filters
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Model.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Model.h
	DM2231_Lab2_MVC/DM2231_Lab2/Entity.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/Entity.h
	DM2231_Lab2_MVC/DM2231_Lab2/EntityFactory.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/EntityFactory.h
	DM2231_Lab2_MVC/DM2231_Lab2/PlayerInfo.h
updated changes
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN