Coffee gets drawn, TODO: does not collide
getting things straight

Merge branch 'master' of github.com:propra13-orga/gruppe13
items are comming