ch1
Revert "ch1"

This reverts commit ef9b8a7b386d85af256d1ae445ae973479fecd31.
Merge branch 'master' of github.com:tomjoad/Margherita
code from orders/table moved to Order class