Updated
Conflicts:
	styles/styles-course.css