testing the whole commit/pull request thing
Merge pull request #2 from zesposi/master

testing the whole commit/pull request thing