committing small stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AttributeVariable.scala
	src/Data.scala
Merge branch 'master' of https://github.com/adressel/prog_synth_sql