Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop
Fixed issue with serializable game state. Now game states can be passed
across the network.
Merge branch 'playingStateGame' into develop

Conflicts:
	src/project2/Server.java
Fixed small issues whith merge
Merge branch 'develop' of https://github.com/klinginE/project2.git into
develop

Conflicts:
	src/project2/Cart.java
	src/project2/MultiPlayerGameState.java