added roxygen stuff
trying to fix merge
adding DESCRIPTION