Added .gitignore
Merged