Added grade, call getGrade() for a string
Merge remote-tracking branch 'origin/master'