Cleanup
Merge branch 'master' of https://github.com/erkol/branch-merge-demo