up
Merge branch 'master' of https://github.com/macmanes/MacManes_Lab_Notebook

Conflicts:
	Matt/clam genome/clam_genome_discovar.md