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

Conflicts:
	teacher/index.html
ש