testing branches
Merge pull request #1 from jtempels/test_check

testing branches