Merge pull request #106 from jackykschou/sprint10Merge

Sprint10 merge
modify some game balance equations