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