Changes gitignore file
Merged changes from f0bce7e0c6