added take_survey view/controller
Merge branch 'master' into take_survey

Megers in secret key generation and attribute update to the surveys controller.
deleted comment
resolved conflict
added choice association
Merge pull request #12 from ibarroladt/take_survey

Take survey