Update calculator
Merge branch 'master' of https://github.com/kitho/CS3343.git
Refactoring baggage plan