comments part 1
Merge branch 'master' of https://github.com/Skiing-Marmot/TravelPlan