User crud step 2
Fixed merge conflict, I hope
Added back in file
Merge branch 'user-crud'
Added back in file
Merge branch 'user-crud'
Added file back in
Merge branch 'user-crud'
Added missing file
Merge branch 'user-crud'
Added missing file
Merge branch 'user-crud'
Updated file from master
Merge branch 'user-crud'