before i break things with commands
Merge branch 'master' of github.com:leon13/scotch
Merge branch 'master' of github.com:leon13/scotch