Clar0737, Kevin Clark, completion of checkpoint1
Merge https://github.com/kevjc/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt