fixing issues
Merge branch 'master' of https://github.com/Uzmani/survey_beard
fixed merge conflicts
added results page and logic
fixed merge conflict