adf
Merge branch 'master' of https://github.com/kirvenjt/276Project

Conflicts:
	SSCLM.cpp