no message
Merge branch 'master' of https://github.com/centi/skoleni1

Conflicts:
	index.html