minor changes in
minor changes in
merged and resolved conficts
Merge branch 'master' of github.com:joanbruna/prediction

Conflicts:
	convnet/train_cnn_timit_sdr.m
	convnet/vl_fit.m