first commit
gitignore merge