Added .gitignore
merge master and fix conflict