Todo ok, creo
Merge remote-tracking branch 'origin/master'

Conflicts:
	tutorias/views.py