merging
Merge branch 'master' of https://github.com/hesselberthlab/lab-projects

Conflicts:
	notes/lab-meeting-notes.rst