working on the notes
Merge commit 'd9231fd6525a4dc8546c3a3db10c1e7303c882c7'

Conflicts:
	tutorial/tutorial.md