Merge error correct
Merge branch 'master' of https://github.com/MTM616/Lecturn