Adding more unit tests
Merge branch 'master' of https://github.com/GeStanley/COMP_5541

Conflicts:
	test/ui/UnitTestSaveFile.java