no message
Merge branch 'master' of github.com:jennyteng/CKDsim

Conflicts:
	DESCRIPTION
fixed converting functions to data.frame elements.
Merge branch 'master' of github.com:jennyteng/CKDsim

Conflicts:
	R/class-AcuteModel.R
	R/class-SlopeModel.R