sync
Merge branch 'master' of https://github.com/NearlyJen/Courses

Conflicts:
	app/views/catalog/_menu.html.erb