adds .gitignore
Initial commit to Git
fix merge conflict