readd gitignore
readd files
fix merge conflict