Make a basic User Model
Merge Please
Resolve conflict with the branch