this is a test for git setup
Merge pull request #6 from qjmcrae/master

this is a test for git setup