Changed some minor things in the test files
Reorganized where parts of the code were to fix a merge conflict. No functional changes

Merge branch 'master' of https://github.com/animesh-garg/videoSeg

Conflicts:
	src/solvers/testPropLabelsMatrixVersion.m