Merging
t Merge branch 'master' of github.com:blazs/lvr

Conflicts:
	src/generate_tests.py

	modified:   src/freser_sat.py
	modified:   src/generate_tests.py
	deleted:    src/problemi-vaje-4-sat.py
Merged