initial commit
fix conflicts in .gitignore