updated .gitignore
Merge branch 'master' of https://github.com/ziah/Ziah_s-Client