did some stuff, I think I repaired the collision detection algorithm so that walls don't harm us any more, but I can't really remember
Merge branch 'master' of github.com:propra13-orga/gruppe13