User Model
Merge branch 'users'
Merge branch 'master' of github.com:chasesutton/buffbook into users
Merge branch 'users'