another test hopefully this will work
Merge pull request #2 from marsmith/master

another test hopefully this will work