Changed gitignore
Merged