DS_Store delete
Merge branch 'master' of https://github.com/Diechang/sample_app