merge issues with show page for itineraries
fix merge issues
Merge remote-tracking branch 'origin/master'
adding some sass to gemfile
Merge branch 'master' of github.com:ml242/gp_app
changed some directories and added sass
added sass and fixed merge conflicts
more styles