user controller
working on user controller
Merge branch 'user'