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

Conflicts:
	client/app/admin/admin.html

Added new route to roleChange page and changed button styles
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/emmasax1/UMM3601ursamajor

Conflicts:
	client/app/admin/admin.html

Added new route to roleChange page and changed button styles