refactoring
Merge branch 'master' of https://github.com/jppop/mywork.js