commit for prac1 checkpoints
Merge git://github.com/gardners/2014SE3
Merge branch 'master' of github.com:zhan0850/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt