Added .gitignore
Before a push
Conflicts Merged