Create user branch
Create users model
Remove index.html from public
Add controller Pages
add pages index
Add link to sign up
conflicts solved