Crazy commit
Merge branch 'master' of https://github.com/pmh92/HypermediaApplications

Conflicts:
	app/models/course.rb
	config/routes.rb
	db/seeds.rb