trip and user model chnge
Merge branch 'master' of https://github.com/khalua/travlr