merging with...? we'll see
committing .gitignore.txt