fixing rakefile
adding 12 factor
heroku instagram changes
merging changes
Merge branch 'master' of heroku.com:afternoon-chamber-5947 into staging
fixed trip show page