CritterWaveBuildTest added
Merge remote-tracking branch 'origin/master'

Conflicts:
	SOEN6441/src/junittest/AllTests.java