Implementing new user functionality
Merge branch 'user-crud'