Added a few more macros to Makefile, modified bug in critical test generation.
Merge branch 'master' of https://github.com/jbrackins/CSC470