Updates tests (apparently?) and included test candidates as per calvins request
Merge branch 'james_branch_2' of github.com:c1moore/cen3031project into james_branch_2

Conflicts:
	e2e/spec/admin.spec.js
Merge branch 'dev' into james_branch_2