Andrew "Added basic expense function"
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject into dev
Andrew "Order calculation added"