more tweeks to ship
Merge branch 'master' of https://github.com/i2c2-caj/CodeCamp2014