merg conflcits
merge conflicts
Merge branch 'mapItinerary'
Merge pull request #2 from justinbc820/master

map itinerarry
Merge pull request #3 from justinbc820/mapItinerary

Merge pull request #2 from justinbc820/master
FIXIN UR CRAP AGAIN