Merging PR's

[Frank Greguska]

How do we actually do a merge to master again? It's not detailed in the
CONTRIBUTING.md doc.

Do we just push to upstream master with a commit message 'This closes #4'