Add a basic User model
Remove files
Merge branch 'modeling-users'