Added gitignore before merge