Edited .gitignore to illustrate simple merge