Add login view controllers
Add Registration
Resolve merge conflict