completed UserController.java
Merge branch 'master' of github.com:Jocbe/SettingWork