update
update
update
Merge branch 'master' of github.com:Narwhalsoft/NARWALS

Conflicts:
	BASH/CLIENTvRICARD.sh
	BASH/SERVERvRICARD.sh
	BASH/TESTCLIENT/CLIENTvRicard.sh
	BASH/TESTSERVER/SERVERvRicard.sh
	BASH/createtestfile.sh