test
Merge branch 'master' of https://github.com/787405797/cnn
Basic functionality