passing r cmd check
fixing merge

Merge branch 'master' of rmflightGithub:rmflight/blogR

Conflicts:
	R/blogr_functions.R