Don't know what I am doing...
Merge branch 'master' of
https://github.com/Finerminer/SWE400Project1.git

Conflicts:
	SWE400Project1/src/test/testUnitOfWork.java