first version
merge .gitignore