commit by gao0141
dd ara a
nort0100
added my fan
Added Jarrad Law
leed0019
Clar0737, Kevin Clark, completion of checkpoint1
add FAN tama0022
Merge https://github.com/Edme0005/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/nort0100/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/leed0019/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/maicallist/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/kevjc/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/law0102/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge https://github.com/tama0022/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
add my fan
checkpoints for load0016
checkpoints for robe0635
Update prac1.md

Spelling correction for line 42, "plane" to "plain".
Merge https://github.com/SamSE3/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt