Make a basic User model (including secure passwords)
Merge branch 'filling-in-layout'