merge test
Merge pull request #60 from MooreJesseB/master

merge test