Docs.
Merge branch 'master' of github.com:pbs/flowy

Conflicts:
	docs/tutorial/tutorial.rst