added User model tests
Merge branch 'master' of github.com:apellizzn/makeable