Merge branch 'master' of github.com:hzab/coffee_counter