Added Halley Freger's name
Merge branch 'master' of https://github.com/Grinnell-CSC195/hw1

Conflicts:
	code/participants.c
Merge branch 'master' of https://github.com/Grinnell-CSC195/hw1