major refactor of conditions
Merge branch 'master' of https://github.com/rpreen/xcsf

Conflicts:
	cl.h
	sam.c