First Hour of the Grand Fix.
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/DM2231_Model.cpp
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_Model.h
	DM2231_Lab2_MVC/DM2231_Lab2/DM2231_View.cpp