init table
merge
merge again
Merge branch 'master' of https://github.com/immefrank/RCS421

Conflicts:
	Yalnix/yalnix.c

	modified:   Yalnix/yalnix.c