renamed trip_controller.rb
Merge remote-tracking branch 'origin/master'
changed @user to current_user on application layout
corrected typo on confirmation message ('>' -> '?')
changed main font
added facebook icon to signin button
added margin to trip title
turned off scroll zoom
added captions to trip show page
working background jobs
Merge pull request #29 from th7/usability

Usability
Merge pull request #30 from th7/background_jobs

Background jobs
resolve conflict