add r stuff
Merge branch 'master' into methylFlowr
Update NAMESPACE
Merge remote-tracking branch 'origin/methylFlowr'

Conflicts:
	methylFlowr/DESCRIPTION