repair gitignore
merge with master