update user show
update user edit
Merge branch 'master' of https://github.com/ted-hanson/roomr