Initial Commit
add git ignore
initial commit
merge conflict for git ignore