this is a test of commiting
this is a test of a second commit
Merge pull request #32 from jjfdit/master

John Fleming Testing Merging 1