bra2coolision
Merge branch 'bra-2'

Conflicts:
	fajl1.txt