added FAN
Merge branch 'temp'

Conflicts:
	grades/assignment1/prac1checkpoints.txt