Merging, fixing .gitignore