remerge
Merge branch 'cracMonkey' of github.com:MS50group3/MADLAB into cracMonkey

Conflicts:
	src/crac/Makefile
	src/crac/makefile
	src/crac/makefile.txt
	src/crac/makefilewack