initial commit
add gitignore
make sure merge completed