Changed merge from master
Still trying to fix merge with Master.
Added virtual update overload
Fixed Merge
Fixed merge conflicts
Created Bet Class
Gun Class added. Time class added. Optimizations done.
Collision Fix
Collision Update. Not complete.
added money class

not sure if can work ._.
Delete Gantt Chart
merge
Merge remote-tracking branch 'origin/gucci' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
Merge branch 'THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' of https://github.com/sp3github/The-Second-Repository into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
Fix collision
Added in delta time for update function
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