First commit
working without network
New tags and minor networkcode for shapesgame
Merge branch 'ShapesGameController' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController
Soundstuff
Shapesgame controller
Merge branch 'ShapesGameController' of
https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController

Conflicts:
	Tendu/src/it/chalmers/tendu/screens/ShapesGameScreen.java
Merge branch 'StartGameFromLobby' of
https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController

Conflicts:
	Tendu/src/it/chalmers/tendu/screens/NumberGameScreen.java
Controller now handles both Shape sending and Lock guessing.
Merge branch 'ShapesGameController' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController
Lock is now a variable of the model, not the gui.
Sends a message when the user attempts to send a shape to another player
Merge branch 'ShapesGameController' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController
Mac-adress in eventmessage.
Merge branch 'StartGameFromLobby' of
https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController

Conflicts:
	Tendu/src/it/chalmers/tendu/Tendu.java
	Tendu/src/it/chalmers/tendu/controllers/GameSessionController.java
	Tendu/src/it/chalmers/tendu/controllers/ShapeGameModelController.java
	Tendu/src/it/chalmers/tendu/screens/NumberGameScreen.java
	Tendu/src/it/chalmers/tendu/tbd/C.java
Merge branch 'ShapesGameController' of https://github.com/tortal/IT2-LP1-Tendu.git into ShapesGameController
Small fix
Fixes to controller
playable
Merge branch 'StartGameFromLobby' into ShapesGameController