stuff
fixed conflicts
Merge pull request #19 from lrakhman/survey_page

Survey page