Merge branch 'develop' into 'master'

.Rproj.user/9DAE6990/pcs/files-pane.pper

.Rproj.user/9DAE6990/pcs/windowlayoutstate.pper

.Rproj.user/9DAE6990/pcs/workbench-pane.pper

.Rproj.user/9DAE6990/persistent-state

.Rproj.user/9DAE6990/rmd-outputs

.Rproj.user/9DAE6990/sources/prop/INDEX

.Rproj.user/shared/notebooks/paths

.gitignore

DESCRIPTION

NAMESPACE

R/mark_estmap.R

R/mark_na.R

R/mark_prop.R

R/tab_mark.R

article/.DS_Store

article/.RData

article/.RDataTmp

article/.RDataTmp1

article/article_figures.Rmd

article/figures/.DS_Store