added tons of stuffs
Merge branch 'master' of https://github.com/Woema/CoffeeServices