Merge remote-tracking branch 'rasmus/master' into convnfix

Conflicts:
	tests/test_example_CNN.m

Author: albertoandreottiATgmail

CNN/cnnsetup.m

@@ -1,4 +1,5 @@
 function net = cnnsetup(net, x, y)
+    assert(exist('OCTAVE_VERSION')==0, 'CNNs does not work with Octave as there is a bug in the implementation of convolution in octave. See: http://savannah.gnu.org/bugs/?39314');
     inputmaps = 1;
     mapsize = size(squeeze(x(:, :, 1)));
 

tests/test_example_CNN.m

@@ -9,13 +9,17 @@
 %% ex1 Train a 6c-2s-12c-2s Convolutional neural network 
 %will run 1 epoch in about 200 second and get around 11% error. 
 %With 100 epochs you'll get around 1.2% error
+<<<<<<< HEAD
 
 if !isOctave() 
    rng(0)
 else
    rand('state',0)
 end
 
+=======
+rand('state',0)
+>>>>>>> rasmus/master
 cnn.layers = {
     struct('type', 'i') %input layer
     struct('type', 'c', 'outputmaps', 6, 'kernelsize', 5) %convolution layer