confict test
Merge branch 'master' of https://github.com/salient-systems/progress-workbook

Conflicts:
	app/assets/javascripts/controllers/progress-workbook.js