Add scaffold for basic user info
Add Basic layout
Merge branch