sss
Merge branch 'master' of https://github.com/DavidSalzer/Smart-Class

Conflicts:
	dataManagement/log/sqlError.log
slide and lesson