added trips on user show page, added markers on trip show page