minor changes for remerging
Merge branch 'treatment_five'

Conflicts:
	app/views/tutorial.eco

Merged in treatment_five branch.  See if it works this time.