prac1

prac1
add my fan
checkpoints for load0016
Update prac1.md

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

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

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

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge pull request #21 from robe0635/patch-1

Update prac1.md - spell check
add FAN
Merge https://github.com/ando0018/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
Merge branch 'master' of github.com:gardners/2014SE3
First checkpoint for SE3 prac1 daw0023
Merge https://github.com/dawzy/2014SE3 into temp

Conflicts:
	grades/assignment1/prac1checkpoints.txt
add unmodified version of networks programming assignment solution.
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message
Uninformative commit message