test framework
Merge branch 'master' of https://github.com/zwelchWI/cs736proj