Database information and canada

ugh
Merge branch 'master' of https://github.com/TeamChahlie/IntraSMUrals