stuff
Merge branch 'master' of https://github.com/justinbc820/TripPlanner2.0