操作失误造成 ios.md加入ignore文件里
Merge branch 'master' of https://github.com/memoryza/Mars

Conflicts:
.gitignore
Merge branch 'master' of https://github.com/memoryza/Mars