adding buttons
Merge branch 'master' of github.com:mattboldt/ColdCoffee