Reorganising
Working on C_Y1 workshop1
Merge branch 'master' of https://github.com/Clyde-fare/Imperial_Chem_Python

Conflicts:
	CMP_Y2/marking/workshop_2_auto_mark.py