edit assessment page, sickness.
Merge branch 'master' of https://github.com/salient-systems/progress-workbook

Conflicts:
	app/views/templates/assessment1.html