init commit
fixed gitignore merge conflict