Edited .gitignore to further illustrate merge