Merge.
Merge branch 'master' of https://github.com/mckgamer/CSE222a.git

Conflicts:
	MinServerTest/src/client/GameThread.java