prvi nastavki
zacetki cnf
krneki
Merge branch 'master' of git@github.com:EvaBr/LVRSAT.git

Conflicts:
	Vaje1in2.py
cnf deloma