Update this is a test note only colin.txt
additional text file test
Merge pull request #2 from mrGimli/master

this is pull request 2