encoding spec factory grade file
grade weights 1
Merge remote-tracking branch 'upsteam/master'

Conflicts:
	spec/factories/grades.rb
Merge pull request #68 from mouse-lin/master

grade for weights 1