Weiter gefuerte SpawnZone Implementierung
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Fixed some NullPointers
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
map_thelongestyard und map_trololol hinzugefügt

trolololololololol
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
arbeit an der kollision mit wasser
Merge remote-tracking branch 'origin/master'
removed crap
dummy_fin_map2 und map_2 korrigiert.
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Merge branch 'master' into sound
Projectile wissen nun auf dem Client welche Richtung die haben
Merge remote-tracking branch 'origin/master'
änderung rückgängig gemacht?
# Buffs completed
Merge remote-tracking branch 'origin/master'

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