testing merge
Merge branch 'master' of https://github.com/mikimer/apricot

Conflicts:
	rao.md
mon nov 17th notes
Merge branch 'master' of https://github.com/mikimer/apricot

Conflicts:
	rao.md