Note.md
Merge branch 'master' of github.com:daweih/plantortho

Conflicts:
	pipeline/note.md