merge conflicts

Merge branch 'master' into devel

Conflicts:
	DESCRIPTION
	R/splitstackshape-package.R
	README.md
trying to resolve merge conflicts

Merge branch 'devel' of https://github.com/mrdwab/splitstackshape into devel

Conflicts:
	DESCRIPTION
	R/splitstackshape-package.R
	README.md