brendan's commit
Merge branch 'master' of github.com:Sealions/csc324_dev_proj