Long time since commit
Properly set-up ignore file
blah
gitignore update
gitignore again..
Blah
Hello
Hello
Blah
Merge fixed