Merge branch 'serveMachine' of https://github.com/Mongoose1021/pong-the-moba into serveMachine

Conflicts:
	client/src/main/java/client/PongDisplayState.java
	pong/src/main/java/client/PongDisplay.java
	pong/src/main/java/client/PongDisplayState.java