Checking errors with the Boss Health
Merge remote-tracking branch 'origin/KnutsBranch' into KnutsBranch

Conflicts:
	COMP2068-Assignment03/COMP2068-Final.v12.suo