Resolve conflict on trip show page
Merge pull request #109 from mud-turtles-2014/fix-bugs

Resolve conflict on trip show page