modifications
Fixing Stuff => Staff
Fixing merge

Conflicts:
	tutor/app/models/staff.rb
	tutor/app/models/test_case.rb
	tutor/db/migrate/20140323113417_create_test_cases.rb
	tutor/db/schema.rb