added simpler implementation of CNN
Merge remote-tracking branch 'origin/matrix' into matrix