Updated some of the testing for TripLocation
AutoScreenTest started
Merge branch 'master' of
https://github.com/tsmock/trip-cost-calculator.git

Conflicts:
	src/com/tripcostcalculator/view/AutoScreenTest.java