Set up an email service to do the email new password feature
Merge branch 'test-back' of https://github.com/JJMcConnell/Software-Engineering-Project into test-back
Fixing up to show array of periods you cant use in exports.test
Just cleaned up front page
Made it so you can't add conflicting events.
Merge branch 'test-back' of https://github.com/JJMcConnell/Software-Engineering-Project into test-back

Conflicts:
	mean-master/app/routes/core.server.routes.js