Merge pull request #4 from Tripleberryflip/master

Pull Request for sync
Fixing merge conflicts between the two repos
Setting up the show page for an event so that from the event page you can add competitors. User Story: 10
 Fixing merge conflicts for competitors and score templates and adjusting the form for the competitors User Story: 10 (also made changes to the data base, dont know if that changes any files)
Placing the links to have a event coordinator sign up a judge for an event in the events show page. User Story:7
Making the application so that when a judge is signed in, the home button takes you to the current profile of the judge, (or the current profile of whoever is logged in). User Story: 12
The change in these files came from working with my co-worker (Dylan) on a problem, therefore modifying files that did not need to be changed by me in the end. The User Stories that apply to this commit are, User Story: 6 and User Story: 7
 Fixing the tests for all of the application. A lot of the tests having to do with the log in / sign up of an event coordinator, and making sure that all of that is working as it should. Also an added gem to the file is why it is 7 files that are changed. The User Stories that are included in this commit are User Story: 1 and User Story: 2
commit with the rspec.results included in it
Resolving the latest merge conflicts

Fixing merge conflicts between the latest commits pushed. This effects
the rspec tests as well as the code for various views, models, and
controllers.