restart tutorial
Merge remote-tracking branch 'origin/master'

Conflicts:
	__init__.py