Literatura
Merge branch 'master' of https://github.com/rosol88/praca

Conflicts:
	literatura.tex