update gitignore
Merge branch 'master' of https://github.com/popo4231/CEM_IOS
merging
merge from POPO