just fixed so the tests could run. The last test that can't run is fine, I didn't finish it but I wanted to commit since I will be gone all day tomorrow.
Tests!

Conflicts:
	mean-master/app/tests/event.server.model.test.js
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project