first commit
add gitignore
merge