Changes
Merge branch 'master' of github.com:kateliu/TravelPal-iOS