Everything burns.
MAY NEED TO REFRESH PROJ In ECLIPSE adter pull, added the .project and .classpath for eclipse
Merge branch 'master' of https://github.com/pizzaboy314/342NetworkGame
Sucessful bare merge branch 'master' into sgmbranch

Conflicts:
	src/server/ClientList.java
	src/server/ClientMessage.java
	src/server/ServerMessage.java