changes for ex3
Merge branch 'master' of https://github.com/seitza/tdcv13
start of ex4
Merge branch 'master' of https://github.com/seitza/tdcv13