Fix merge error in Gemfile.
Resolve merge conflicts in routes.rb.
Fix merge conflicts in event views.
Migrated shifts to db.
Fix errors in shifts routes and views. Now a shift belongs to the event it was created for.
logout button now routes to the login page
Merge pull request #5 from dlmather/feature/mailviews01

minor view tweaks
Create scaffold for mailer.