add a simple merge function
Merge branch 'master' of https://github.com/RGLab/COMPASS

Conflicts:
	DESCRIPTION
	man/COMPASSContainerFromGatingSet.Rd