test commit
add correct trigger
Merge branch 'master' of https://github.com/Isaisaisa/DB-Merlin

Conflicts:
	scheme_setup.sql