JUnit Test Updates

-UserTests is done
-GamesTests done through Create, Join, List (save and load not
implemented—> to be done by joe if he decides)
Make Sure Old Client JUNITS Work

ServerProxy JUnit tests are working
Merge branch 'master' of https://github.com/Chad-Barlow/CS340

Conflicts:
	Catan/Testing/server/junit/UserTest.java