finished work on user_trips, user_dashboard, trip_feed, login, and signup pages
finished working on my six pages
fixed merge conflict in foundation and overrides css