Fix
Merge branch 'master' of https://github.com/kateliu/TravelPal-Web