Merge branch 'master' of https://github.com/st-james-software/uct-maths-competition into william16
names are lowercase with 1st letter capital
Merge branch 'william16' of https://github.com/wyllos/uct-maths-competition into 201312Week3

Conflicts:
	uctMaths/competition/views.py