adding .gitignore
cleaning
fix conflict in gitignore from merge with master