Matlab 1a
Merge remote-tracking branch 'origin/master'

Conflicts:
	worksheet1/worksheet1.m
Merge branch 'master' of https://github.com/FMenhorn/ScientificComputingLab

Conflicts:
	worksheet1/worksheet1.m