male upravy
Merge branch 'master' of github.com:FruitOfLight/vida
Merge branch 'master' of github.com:FruitOfLight/vida
nic
Merge branch 'master' of github.com:FruitOfLight/vida

Conflicts:
	backup/program.alg