lii
Merge branch 'master' of https://github.com/jasonlvhit/convnet.git