Minor formatting and bib edits
Merge branch 'master' of https://github.com/SamDund/Assign2Education