Merge pull request #89 from lambchopz/master

PULL!!
Grant's tests and a couple updates
comment
Merge pull request #90 from HexSoftware/GTests

G tests
Merge branch 'master' of https://github.com/HexSoftware/TestGen
Grader stuff