gitignore added
Merged