merging
merged

Merge branch 'master' of github.com:wrbrooks/beauty_contest

Conflicts:
	scratch/beauty-atomic-scratch.r
Producing writeup via RMarkdown