Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
created modified versions of params<->stack for the cnn, undebugged (sketchy) backprop code
Merge branch 'master', remote-tracking branch 'origin'