edit
Merge branch 'master' of https://github.com/emfuller/vms_segmentation

Conflicts:
	RowTest2.txt