modified .gitignore
Merge branch 'addignore'