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

Conflicts:
	ULSA4b7_DC/Makefile
	ULSA4b7_DC/ULSA4b7_DC
	ULSA4b7_NOGUIDE/Makefile
	ULSA4b7_NOGUIDE/ULSA4b7_NOGUIDE
	ULSA4b7_NOGUIDE/ULSA4b7_NOGUIDE.cpp