add FAN
Merge https://github.com/ando0018/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge branch 'master' of github.com:gardners/2014SE3