Added gitignore
merging