cross fire pattern in the bag
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMSC425/settings.ini