Calvin's corrections and fixing an accidental branching
Merge branch 'james_mocha_tests' of https://github.com/c1moore/cen3031project into james_mocha_tests

Conflicts:
	app/tests/user.server.model.test.js
Changes to tests for Calvin's suggestions
Merge branch 'james_mocha_tests' into dev

Merging in new tests and modifications from the group meeting
Created the first Event model schema
Developing EventSchema
Edited candidate test and user schema.
Event schema first sorta-working version
Changed roles to a list of roles, added event uniqueness
added candidate schema
Added planning docs and updated user schema.
Merge branch 'c1moore_branch' into dev
fixed bug in candidate schema, extra trim
bug fix in candidate
bug fix in candidate
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
fixed bug in candidate
Fixing errors with candidate tests.
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Matched event test to schema event name