update
Merge branch 'master' of https://github.com/QingqiShi/Galactic-War-Arcade

Conflicts:
	documents/G51FSE Coursework.docx