committed coffee machine stuff
new stuff
Merge branch 'master' of https://github.com/JustGoscha/coffeegamejam