add my fan
Merge https://github.com/SamSE3/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt