Merge pull request #14 from sichinumi/master

Annotation editing and grade calculations