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