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

Conflicts:
	src/ConditionVariable.scala
	src/OutputVariable.scala