save and wait for merge
Merge branch 'master' of github.com:kateliu/TravelPal-Web

* 'master' of github.com:kateliu/TravelPal-Web:
  Dump data to travel page.
adopt some basic travel information into templates
Merge branch 'master' of github.com:kateliu/TravelPal-Web

* 'master' of github.com:kateliu/TravelPal-Web:
  show my travels