Merge branch 'master' of https://github.com/st-james-software/uct-maths-competition into william16
[UPDATE] user can reset password via email
Merge branch 'william16' of https://github.com/wyllos/uct-maths-competition into 201312Week3