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