user refactor
Merge branch 'master' of github.com:prograils/railspeople