Small Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	TriviaMaze_CSCD350/TriviaMaze_CSCD350/ClassDiagram1.cd