Merge pull request #41 from jdjkelly/staging

Staging
Merge pull request #42 from jdjkelly/staging

Staging
Merge branch 'master' of github.com:jdjkelly/quantify
Better places and weight stacks