Merge pull request #4 from albperez/master

More stuff
Merge pull request #5 from albperez/master

Did things
Manage/Edit Users

Added the manage and edit user pages for the admin.
Merge remote-tracking branch 'upstream/master'
Did things

This should be everything front end wise. Just email remain I think