branch tester
Merge pull request #1 from khearn/kh_testing

branch tester