gtlaflair fixed merge error
fc793de Dec 19, 2018
fixed merge error
Merge branch 'master' of https://github.com/gtlaflair/rcrtan

# Conflicts:
#	cran-comments.md
fc793de