makefile for program.c and header.h
Make file for program.c and header.h
Merge branch 'master' of https://github.com/Grinnell-CSC282/hw7-2014S
merge
Conflicts:
	zbyrnefio/explanation.md