Changed merge from master
Manually added in Roland's changes

The change include collision as well as rendering the tilemap
Still trying to fix merge with Master.
Merge remote-tracking branch 'origin/THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN' into THE-NEW-MASTER-BITCHES-PLZ-NO-DESTROY-AGAIN
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
Gun Class added. Time class added. Optimizations done.
Collision Fix
Collision Update. Not complete.
Delete Gantt Chart
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
Update on collisionevents