kurasus (classes)
Fix merge conflicts
Merge branch 'master' of https://github.com/iamsolipsism/PandaTutor

Conflicts:
	db/schema.rb
Rename 'department' to 'course'