outline of response
ff head
Merge branch 'master' into take_survey
remove note
update controller
update survey controller to master
resolve conflict in surveys controller