slight modifications
resolved little conflict
Merge branch 'master' of github.com:joanbruna/prediction

Conflicts:
	TrainDL_wrapper.m