gitignore
fixed merge conflicts
initial commit