improved .gitignore
Merge branch 'master' into stay-in