initial commit
merge gitignore