Fixed up triggers
Merge branch 'master' of github.com:dkellycollins/CIS560_TeamProjects

Conflicts:
	sql/triggers.sql
More updates to queries