remote changes
remote changes
Fixed conflicts
completed MVC for User