my updates, start of graph opt flow
resolved conflicts
Merge branch 'master' of github.com:joanbruna/prediction

Conflicts:
	optflow/nmf_optflow.m
	optflow/optflow_taylor_temp.m