DAY7 ENTITYCLASSSSSSSSS

DDDDDDDDD;
Player translate minus mapOffset
Get rid of couts
Changed merge from master
hi
Manually added in Roland's changes

The change include collision as well as rendering the tilemap
Still trying to fix merge with Master.
fix ?
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
Added virtual update overload
Fixed Merge
Intergration fix with Roland's work.
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN

Conflicts:
	DM2231_Lab2_MVC/DM2231_Lab2/Entity.h
Fix Merge
Intergrated the work of the State Class
Fixed merge conflicts
Created Bet Class
Merging work into the intergrated
Merge fixes with Master
Gun Class added. Time class added. Optimizations done.