Init
Merge branch 'master' of github.com:jeserkin/coffee-machine