Added gitignore
REsolved conflicts