Changes in cnn.
Merge branch 'master' of https://github.com/albertoandreottiATgmail/DeepLearnToolbox

Conflicts:
	data/generate_mfcc.m