Super Popis u Drinciho Textaku

Lukino je boss
Merge remote-tracking branch 'origin/my-branch' into my-branch

Conflicts:
	jgfdjgfc.txt
delete
vytvorenie textaku by Lukino