preparing to merge
merged

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

Conflicts:
	R/collate.r
	scratch/beauty-atomic-scratch.r