initial commit
fixed conflicts in .gitignore