added some stuff
Merge branch 'master' of https://github.com/seitza/tdcv13

Conflicts:
	ex1/convolution_linda.m