Updated to add support for expenses in navbar.
Merge branch 'master' of https://github.com/CPSC362/TripCost