Ignore project/target files
Merge branch 'master' into develop
Don\'t touch this
Merge branch 'develop'