.gitignore from other machine... we'll merge.