dd ara a
Added Jarrad Law
Merge https://github.com/law0102/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt