gitignore
foo
Merge branch 'master' of https://github.com/benvand/mcindoe
conflict resolution for .ignore remove .idea and specify exact files