Ken broke (and now fixed) the Makefile.  Bad Ken\! Bad\!
Merge branch 'master' into ProcessExploration
Merge branch 'ProcessExploration' of github.com:kjplatz/CS6380Project1 into ProcessExploration