working on trip show spec; need to merge in master
merged master
trip deleteability
user profile page finished - logic in controller for viewing public and private trips