Merge branch 'master' into go-live
merge resolution
merge resolution
Merge pull request #39 from th7/usability

Usability
Merge pull request #37 from th7/go-live

Go live
minor fixes, added show trip button
fixed main redirect
moved delete link to edit page for trips
fixed redirect bug on main controller
fixed redirect
uncomment photo color feature
fixed view trip button
add color hash to data attribute to each photo in show view
Merge branch 'usability' of https://github.com/th7/journey-tracker into fine-tuning
color lines dynamically