my first commit
merge .gitignore