added my FAN
Merge branch 'master' of https://github.com/schr0082/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt