fixed up a bit from that error
Merge branch 'master' into survey_controller
Merge pull request #11 from lrakhman/survey_controller

Survey controller