Merge pull request #2 from GitNooby/master

test merge 2
see what happens
Merge branch 'master' of https://github.com/zhonglinyuan/appProject
Merge pull request #2 from zhonglinyuan/master

pull request for iOS files