Added @Mitch as an admin and added the crude ability to change user roles.
Added Mitch as an admin and added the ability for the admins to change user roles.
Merge branch 'master' of https://github.com/farmx009/UMM3601ursamajor

Conflicts:
	client/app/main/main.controller.js