Initial commit
init ..
.gitignore
fixed conflicts