stuff
add global .gitignore
stuff
merge
stuff