Added User model and tests
merge commit
merge commit