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

Conflicts:
	Matt/General Code/Pero Tophat.md.plist
	Matt/General Code/Tophat notes.md.plist