Genshin/GAKUEngine — pull request #88 by tapalilov (2012-08-22 06:12:01+00:00)
Title: fixing conflict and matching

fix conflicts and matching grading calculations