Files we last worked on
Merge branch 'mybranch_am' of https://github.com/cs3380/travelproject
Started to add files