t
Lobby Update: Lobby sollte jetzt funktionieren, es gibt Exceptions wenn
leere PlayerData gesendet wird.
.iml-Dateien entfernt und .gitignore aktualisiert.
Merge branch 'network/chat' of ssh://git@github.com/hottehead/GameDevWeek.git into network/chat
git problem
LobbyManager added
Merge remote-tracking branch 'origin/network/lobby' into network/lobby

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ClientGameDatagramHandler.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ClientLobbyDatagramHandler.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/DatagramFactory.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ServerGameDatagramHandler.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ServerLobbyDatagramHandler.java
TeamColor implemented
TeamColor in PlayerData
Player
Merge remote-tracking branch 'origin/master'
add gitconfig
add gitconfig
add gitconfig
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ServerEgg.java
Merge branch 'dev_gameplay' into integration_test/network_gameplay

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
Merge branch 'network/chat' into integration_test/network_gameplay
Merge branch 'network/lobby' into integration_test/network_gameplay
Merge branch 'master' into integration_test/network_gameplay