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
Collision problems detected. Under fix.
???
Revert "???"

This reverts commit 2736d56cdc39f4288f70807572504fc680bca931.
Revert "Collision problems detected. Under fix."

This reverts commit 0360bfbb913ac0e7f26c5021e652eed9a51e9eff.
Shop
Merge remote-tracking branch 'origin/gucci' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
Fixed Collision for Bullets and Entity.

Added in loading items from Map
updated changes
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
Fix bullets collision and zombie colli
Filters