allow super admins to CRUD users
add ability to update users WIP
resolve merge conflicts
fix errors related to users#edit
update user show page
Merge pull request #2 from epicodus/crud_users

Crud users
UserMailer
fixed seeds
add gem rails12factor
add change password
Merge branch 'master' into edit_password

making sure edit passwords feature plays well with updates to master.
Merge branch 'master' of https://github.com/epicodus/chicktech into tasks