trigger2 more or less fixed... or maybe
Merge branch 'master' of github.com:johnhult/DataBaser