fixing package import issues
working

Merge branch 'master' of https://github.com/kkeenan02/diveRsity

Conflicts:
	DESCRIPTION