Latest merge
Merge branch 'master' of https://github.com/bgrosskleg/CMPT350