One does not simply merge into master
Merge pull request #81 from originalnick/master

One does not simply merge into master