Conflicts: app/views/courses/_course_activity.html.erb app/views/layouts/_user_courses.html.erb app/views/users/_course_homework.html.erb