this is a test commit
Merge pull request #1 from ardoyle/bryan_first_changes

this is a test commit, please pull in my changes