tweak readme, remove unused function and fix cancel button
Merge branch 'master' of 192.168.1.87:/home/daniel/git/BarBot
add db diagram
start adding ability to set glass type, and add manual ingrediants at the start
Merge branch 'master' of github.com:NottingHack/BarBot