minor corrections in convolution; updating exercise 3
Merge branch 'master' of https://github.com/seitza/tdcv13