User model
Merge branch 'master' of github.com:staxworks/maximilian-the-dog