Correction of Matlab readin. Functionality test
Merge branch 'master' of https://github.com/malterik/ISIM-Project.git

Conflicts:
	src/erik/TreatmentPlanner.java