modify gitignore
修改了依赖 删除了多余的iml
merge conflict
删除iml文件
Merge pull request #1 from coffeesherk/master

delete unreleated file