Minor edits to tutorial.rst
Fixed conflicys in tutorial.rst
Merge branch 'master' of git://github.com/jeromekelleher/wormtable

Conflicts:
	docs/source/tutorial.rst