Adding the users page
Merge branch 'master' of https://github.com/laurenboyes/GitSandBox