ex2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Framework Exercise 2/src/exercise2.m
	Framework Exercise 2/src/get_inbetween_image.m
	Framework Exercise 2/src/get_opticalflow.m