codocalypse
Merge branch 'master' of github.com:elmewo/testumgebung

Conflicts:
	Camera_Calibration/z041_f249.m
	Camera_Calibration/z041_f300.m
	Camera_Calibration/z041_f350.m
	Camera_Calibration/z075_f249.m
	Camera_Calibration/z075_f300.m
	Camera_Calibration/z075_f350.m
	HE_Calibration/z041_f249_HE.txt
	HE_Calibration/z041_f300_HE.txt
	HE_Calibration/z041_f350_HE.txt
	HE_Calibration/z075_f249_HE.txt
	HE_Calibration/z075_f300_HE.txt
	HE_Calibration/z075_f350_HE.txt
	testing.cpp
	testing.h
	testing.sublime-workspace
	testing.sublime-workspace.orig