first commit
gitignore working and merge