testing stuff
Merge pull request #3 from dglunz/newnew

testing stuff