Toby manage users and roles files
Toby

changes
Merge branch 'master' of https://github.com/wineswish/cs321

Conflicts:
	Project/Default.aspx
	Project/ManageRoles.aspx