initial commit
added git ignore
merge conflict