Merge pull request #1 from tansaku/master

various
Merge pull request #2 from tansaku/master

oops forgot
order comms complete
starting to calc price of an order
Fri 13th update!
adding takeaway class
fixing things up