more organizing
Merge branch 'LaurensBranch' of https://github.com/CST-316-Group-M/Project-Repository into LaurensBranch