first commit
gitignore
fix conflicts