Conflicts: app/helpers/application_helper.rb public/stylesheets/courses.css public/stylesheets/new_user.css