initial commit
merge .gitignore