need to pull rebasing
Merge branch 'master' of
https://github.com/tsmock/trip-cost-calculator.git

Conflicts:
	src/com/tripcostcalculator/model/CostCalculation.java
	src/com/tripcostcalculator/model/CostCalculationTest.java
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
Merge branch 'master' of https://github.com/tsmock/trip-cost-calculator.git
fixed the map screen class to use sofia