git problem
LobbyManager added
Player
Merge remote-tracking branch 'origin/master'
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 'master' of https://github.com/hottehead/GameDevWeek.git
LevelLoad Aktualisiert
Merge remote-tracking branch 'origin/master'
.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ServerEgg.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/kit/AttackShootArrow.java
remove
initPhysics grob abgeschlossen
Merge remote-tracking branch 'origin/master' into rendering
render remoev
TeamColor in ClientProjectile hinzugefügt.
# Fixed calling method on a null object # Added movement reset to wait
function
Merge remote-tracking branch 'origin/master'