Merge branch 'master' of https://github.com/jvcleave/ofxPiecemaker2
stash