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
ajax photo delete and default date in migration
added display_date method to photo model
tweaked photo info display and photo upload area
working background jobs
fixed js selectors
Merge pull request #29 from th7/usability

Usability
Merge pull request #30 from th7/background_jobs

Background jobs
Merge pull request #27 from th7/rspec

update specs, remove unused code
resolve conflict
Merge pull request #28 from th7/trip_controller

Trip controller
resolve conflicts