Merge branch 'master' into Geoffs_WIP
More Descriptions

I added more of them
Merge branch 'master' into Geoffs_WIP
Merge branch 'Geoffs_WIP'
Merge branch 'master' of https://github.com/Mattrask/CSCI1101-group_project