To merge
Merging
Merge branch 'master' of github.com:renatocf/MAC0426-PROJECT
Correcting mistakes with foreign keys and trying to use triggers