Merge branch 'master' of https://github.com/RyPope/COMP3350

Conflicts:
	Project/src/objects/Client.java
	Project/src/tests/objectTests/ClientTest.java