bug in creation
Merge branch 'master' of https://github.com/khalua/travlr
made trips show up
merge confilict in index