Merge branch 'master' of github.com:slowteetoe/stacks_on_stacks