master > More coherent variable names.
Merge branch 'master' of github.com:supernintendo/sherbet