my first change on a test file
merged latest master
Merge pull request #2 from kviksilver/myChange

my first change on a test file