first commit
fix ignore file
Merge branch 'master' of github.com:xzrunner/easycombine