first commit with justin
Merge branch 'master' of https://github.com/oddurs/tripplanner