FIX: Sound is now played on client
FIX: Contact pair are not falsely remembered
Merge pull request #11 from Mongoose1021/SoundOnClient

FIX: Sound is now played on client
FIX: Split modules server and client
ADD: Pong Module
ADD: Bytes to Pong module
Merge pull request #13 from Mongoose1021/MultiClient

Server Refactor for MultiClient - Modularized Pong Project
FIX: Merge with master
FIX: ADD enter IP
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