added .gitignore
Merge branch 'master' into dev_chrome_extension