Re-knitted proposal
Merge branch 'master' of https://github.com/SamDund/Assign2Education