Resolving merge
Add .gitignore