testing merge with Gavin
I merged things
Merge pull request #8 from sumnerjj/master

new merge test fun