Updates
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1

Conflicts:
	SWE400Project1/src/domainModel/UnitOfWork.java
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1

Conflicts:
	SWE400Project1/src/domainModel/CommandToAcceptFriendRequest.java