# imported physixbody to game.java
.iml-Dateien entfernt und .gitignore aktualisiert.
seperate healthbar into class
Merge branch 'hud' of https://github.com/hottehead/GameDevWeek into hud
merged test code form levelselectrostage to testhudstage
deleted levelselectorstage
extended TestHudStage from AutoResizeStage
doPlayeraktion hinzugefuegt
Was war jetzt nochmal mit Playerintention geplannt?
healthbar
Merge branch 'hud' of https://github.com/hottehead/GameDevWeek into hud

Conflicts:
	gdx-test/src/main/java/de/hochschuletrier/gdw/ws1314/hud/TestHudStage.java
I really did nothing with this file =)
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
Filename fixed
Eine Pseudo Connect Klasse eingefuegt die BISHER funktioniert
Nicht implementiert Level Importer
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'sound'

Conflicts:
	gdx-bunny-brawl/src/main/resources/data/json/sounds.json
bad json
nullptr exception
sounds.json gefixed
Jungs ernsthaft, achtet auf die Filenames Yeah != Yay
git problem