changes mytrip page
merging conflict my_trips.css solved
update addTrip page