prac4 run2 written
Merge branch 'master' of https://github.com/jgowans/prac_automarker_client

Conflicts:
	group_manager.py
	prac4.py