button built but ugly
merged and resolved conflicts in home.html.erb and application.css
Button styling, placement, and pathing finished
building cancel and confirm tests and options. need to pull head from origin.
Merge branch 'master' of github.com:Egogre/drinking_dash
merged head
Merge branch 'master' of github.com:Egogre/drinking_dash
merged newest master
order complete and cancel buttons built but no functionality
Merge branch 'master' of github.com:Egogre/drinking_dash into order_confirm
Merge branch 'master' of github.com:Egogre/drinking_dash into order_confirm
merged new info and applied changes including moving update_paid to models