initial commit
initial .gitignore
fix merge conflicts