Cleaned up
Merge branch 'master' of https://github.com/m0neysha/Choco-Chip-Cookies

Conflicts:
	GameBoard$Network.class
	GameBoard.class
	player/GameBoard.java
I don't know anymore..