added user model
added user testing
Merge branches 'model-users' and 'master'