update
update
Merge branch 'master' of https://github.com/adressel/prog_synth_sql

Conflicts:
	sql/load.sql
	src/CNF.scala
	src/Clause.scala
	src/main.scala