a

a
d
Merge branch 'master' of https://github.com/joanbruna/prediction

Conflicts:
	optflow/train_nmf_optflow.m
cc
Merge branch 'master' of https://github.com/joanbruna/prediction

Conflicts:
	optflow/train_nmf_optflow.m