merge.sh must have UNIX line endings, otherwise it can't be executed
Merge pull request #13 from steinsag/unix

merge.sh must have UNIX line endings, otherwise it can't be executed