more work on china boxes
Merge branch 'master' of https://github.com/rmosolgo/sinatra-stuff