added .gitignore"
fixed merge conflicts
.gitignore stuff