addition of FAN
Merge branch 'master' of github.com:kris0068/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt