added my FAN
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Merge branch 'master' of github.com:kaln0012/2014SE3 into temp

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