Merge branch 'user-model'
Merge branch 'master' of https://github.com/erahm/fatbard