prac1

prac1
commit for prac1 checkpoints
Merge git://github.com/gardners/2014SE3
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
prac1checkpoints
Adding my FAN for marking
Merge branch 'master' of github.com:kaln0012/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt