updates
updates2

Merge branch 'master' of github.com:herbps10/upstat-competition

Conflicts:
	paper-knitr-concordance.tex
	paper-knitr.Rnw
	paper-knitr.bbl
	paper-knitr.log
	paper-knitr.pdf
	paper-knitr.synctex.gz