Adding some things
Fixing gitignore conflict