.ignore 更新，注意忽略
proguard-project.txt，
project.properties
.settings
Merge branch 'master' into dataBase