Mereged commit with edited .gitignore
2 files changed