Adding a .gitignore to master.
Subtree merge test: merging an actual build.