Merge branch 'master' of https://github.com/Canadanja/Project-3tex

Conflicts:
project3.pdf