arbeit an der brücke
Merge remote-tracking branch 'origin/master'
Bug fix und Verlagerung der Server und Client verbindung in die
vorherige State.
added more and more sounds
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/states/ServerLobbyState.java
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
arbeit am spieler
Merge remote-tracking branch 'origin/master'
Changed some things at start as server
Server Funktionen verfeinert