# nothing changed
Merge remote-tracking branch 'origin/master'
Team Icons for HUD added
Spritesheets for Hunter Animations added
# Added getFixture Method responsible for collision detection # Added
details to player collision detection using different fixtures
responsible for different types of collision
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java