prvni zmena
druha zmena
treti zmena
zmena v test vetvy
Merge branch 'refs/heads/test'

Conflicts:
	login.html
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	login.html