Merge conflict test
Merge pull request #4 from ummerr/small-conflict

Merge conflict test