little change in ContactMine
Merge remote-tracking branch 'origin/master'
map edit: tryanewone neu und map01 gefixt.
tank idle down graphics added
Fehlende NullPointer Behandlung engefuegt
# Improved Sword collision detection # synchronized with animation
ContactMine almost ready
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge remote-tracking branch 'origin/master'
ContactMine Damage
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
changed textButton to ImageButton
Grafik für Beendenbutton eingefügt.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
changed of new local sound
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/hud/MainMenuStage.java
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Clear build directory before auto-build.