DAY7 ENTITYCLASSSSSSSSS

DDDDDDDDD;
Player translate minus mapOffset
Fixed State. Fixed Textures. Fixed UI.
Get rid of couts
hi
Manually added in Roland's changes

The change include collision as well as rendering the tilemap
fix ?
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
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
Merge fixes with Master