gitignore
gitignore
delete config.txt
novy ignore
zmena1
zmena2
zmena3
zmena v testu
Merge branch 'test'
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.gitignore
	index.html