Parameterize out master
Merge branch 'master' of github.com:yaneurabeya/scratch