Version on which tests are conducted
Version on which tests are conducted
Merge branch 'master' of https://github.com/gawkowskimichal/GIS

Conflicts:
	MATLAB/main.m
	MATLAB/push_relabel.m
	MATLAB/push_relabel_highest_label.m