Merge branch 'master' of https://github.com/joethe/UMM3601ursamajor

Conflicts:
	server/config/seed.js
fixed open/close braces