Adding my FAN for marking
Merge branch 'master' of github.com:jackjjw/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt