Update
Merge branch 'master' of https://github.com/yottalab/code

Conflicts:
	notes