Merge branch 'master' of https://github.com/MrAGi/COMP4Coursework

Signed-off-by: Adam McNicol <adam@mcnicol.me>

Conflicts:
	Design/design.md
Merge branch 'master' of https://github.com/MrAGi/COMP4Coursework