Dealing with merge conflicts. Fixing and saving the appropriate sections of the merge conflicts presented.
 A judge can now have the same email adress but needs to have a different and unique user name (can not have the same user name as a different judge) This is so that the same person with an email adresscan be a judge for multiple events. User Story: 12
This commit is for the setup for the system to notify the judge that they have been created and send them an email telling them their credentials. The ammount of files changed/created is because of the fact that new files had to be generated in order to make the mailer.  User Story: 21
Adding tests to make sure that the mailer is working propoerly to notify judges that they have been created User Story: 21
 writing test results to the rspec.results file
 Modifications to attempt to get the mailer working properly. Making sure that the configuration files all have the right information in them. User Story: 21
 Fixing Merge conflicts from 4/16 push
Merge conflicts and mailer code

Resolving merge conflicts and pushing some of my co-worker's code so
that the two branches are in sync.