first commit
adding .gitignore
fix conflict