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

Conflicts:
	index.html
	templates/slide.html
x