Create a merges/<platform> folder for each configured platform
Merge pull request #35 from kennethkalmer/platform-merges

Create a merges/<platform> folder for each configured platform