commiting .gitignore
merge
timming answer