Added Gerald Jordan Dykstra to the student list
Merge branch 'master' of https://github.com/Sharptoe1/395lab into sharptoe1-fix

Conflicts:
	students.txt