Modified gitignore
Merge attempt
Merge