my stupid message
Merge pull request #1 from jabram/master

my stupid message