updated profile and trips page
conflict resolution
adding devise edit forms
resolved conflicts