Updated Makefile to propagate changes to the executable name
Updated main so it would fail gracefully without enough arguments
Merge branch 'master' of https://github.com/brrcrites/CS220_Framework

Conflicts:
	Makefile