first commit
merged gitignore