.
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
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/ServerPlayer.java
.
.
Merge remote-tracking branch 'origin/master'
ServEgg einsammeln geschafft