added link to sign in with Socrates
Updated Users table
resolved merge conflicts with UserTableUpdate branch
routes ended and seeds updated user
Merge pull request #14 from michaelanthonymain/jaime-fixins

routes ended and seeds updated user
first commit for email. mostly working. need to connect existing work to current users.
Merge pull request #15 from michaelanthonymain/action-mailer-1

first commit for email. mostly working. need to connect existing work to...
changed first/last name to just name
Merge pull request #16 from michaelanthonymain/show-view-name-update

changed first/last name to just name
New Event Notification is working and configured.
Merge pull request #17 from michaelanthonymain/action-mailer-2

New Event Notification is working and configured.
Fixed merge conflict in routes.rb