edited files so that NAMESPACE is created by Roxygen2
Merge branch 'develop' of https://github.com/chihayakenji/catseg into develop

Conflicts:
	R/entropy_diversity.R