Students, TAs, Admins (Users tab)
Merge branch 's3-users' of https://github.com/arkon/Markus into style-guide