working on adding locations to trips still
Merge branch 'master' of https://github.com/cml391/6.470