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

Conflicts:
	paper.Rnw
	paper.log
	paper.pdf
	paper.synctex.gz
	paper.tex