need to update user edit page
create math controller
Merge branch 'master' into Sharon
Add new master code to branch
Merge branch 'master' into venkman
Merge pull request #74 from blind-squirrel/barryn

Barryn
completed all security and fixed formatting on edit page. Also have roles showing role names, not numbers
add comments to functions
Add new code
Merge branch 'master' into venkman
done with security. Moving to another section
edit MathController
Merge pull request #75 from blind-squirrel/Sharon

Sharon
Merge pull request #76 from blind-squirrel/venkman

Venkman
Merge pull request #77 from blind-squirrel/barryn

Barryn