9e7323539f923b5387b9ec9239b5aeb, reversing changes made to da9c374ed9. Conflicts: app/views/users/_user_homework_form.html.erb
da9c374ed9