fix signin
sessions#new
added the quiz
fix merge conflict