first commit
merge conflicts fixed: .gitignore