konflikt?
Merge branch 'master' of https://github.com/centi/skoleni3

Conflicts:
	login.html