initial commit
git ignore conflict resolution