Finished first cut of the User model
Screwing up git
Merge branch 'modeling-users'