small changes
Merge branch 'trip' of https://github.com/khalua/travlr into trip
buggy
Merge branch 'trip' of https://github.com/khalua/travlr into trip