Fixed merge conflicts in Gemfile and Gemfile.lock
Fixed merge conflicts
Created conversations_controller and updated user model to include notifications_email method
Merge conflicts in gemfile and gemfile.lock
Nested resources conversation in users to add routes for notification system
Created conversation and messages views as well as added new actions to the conversations controller
Created two new helper methods to be used in the layout view to notify users of new messages
Fixed typos in conversation_controller, added helper methods to application controller, and added messages to environment
Updated schema to reflect photos and notifications
Fixed merge conflict
Fixed typo in initialize/mailboxer
Merge conflicts resolved in user model
Added a host name for mailboxer to properly send out notifications
Uncommented messagin application initialize
Added mailboxer action in the controller, modified the conversation index, and created the proper form partial for the mailer
Changed the redirect route once submitting a message.
Added new borrowings controller and increased functionality on my messaging
Gemfile.lock merge
Added correct borrowing routes and modified actions in the borrowings route