Added excersize 5 and renamed group "ex4"
Merge branch 'master' into shape_isolation

Conflicts:
	Image Analysis.xcodeproj/project.pbxproj
	src/App.cpp