Make a basic User model
Merge branch 'filling-in-layout'