initial commit
gitignore fix conflict