c
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	src/com/sm/backpackingplanner/TripItemList.java
Merge branch 'master' of https://github.com/marcokstephen/BackpackPlanner