Change 2 of a not so clean merge
Merge branch 'master' of https://github.com/soapyking/Lern2gitClass

Conflicts:
	notes