tags and trips working now :D
Merge branch 'master' of https://github.com/akhor93/tripshare
merging Andrew's changes