worked on user views for user, questions, controller
resolve merge conflicts
login/sign-up fields added
removed dev log