one more
as
Merge branch 'master' of https://github.com/joanbruna/prediction

Conflicts:
	convnet/vl_fit.m