Added student number
Merge remote-tracking branch 'origin/master'
with conflicts in CPSC310 Lab.txt
Conflicts:
	CPSC310 Lab.txt