ignore conflicting files like project.properties & gen/.
Merge pull request #19 from mrstrlc-yipeng/ignore-conflicting-file

ignore conflicting files like project.properties & gen/.