commit
Merge branch 'master' of https://github.com/jsyczhanghao/paffe-simple-demo