modified gitignore
merged with origin