to merger
Merge branch 'master' of github.com:mouda/Steven

Conflicts:
	ULSA4b8_DC/ULSA4b8_DC.cpp
baseline fixed