minor updates
fixed conflict in lagrangian_bidict
Merge branch 'master' of github.com:joanbruna/prediction

Conflicts:
	scripts/lagrangian_bidict.m