Add taking survey functionality and other minor changes
Merge pull request #11 from masidonion/judy

Add taking survey functionality and other minor changes
solve merge conflicts