nothing important
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
log outputs removed
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
mergeconflict solved
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
nothing
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
speedbuf
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git