for merge
Merge branch 'test-back' of https://github.com/JJMcConnell/Software-Engineering-Project into test-back
got the docs to display on html -- still figuring out the smaller details