Merge remote-tracking branch 'origin/PopTrack-Laptop'
Merge branch 'master' of https://github.com/SoylentGraham/ofxSoylent