Revert "Revert "Merge branch 'master' of https://github.com/Chas-Fordyce/Math_Project""

This reverts commit c62b7ad381658ef84415c7cce8d461d833b69e8e.