added halley's php
Merge branch 'master' of https://github.com/Grinnell-CSC195/hw9-2014S

Conflicts:
	links.md