Adding git ignore file
Merging