strat of emailing action plan
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	public/js/coachDashboardControllers.js
	public/js/participantController.js
	routes/mailer.js
	server.js
Assessment results. Ready for Sean to fix html