Watch out for messy merges! Fixed conflict in coursem.rb