Configured Devise and generated views and model User. Had to re-generate landing page Welcome#index
Fixed merge conflict