user page view all surveys take survey
fixed merge conflict
Merge pull request #5 from burke187/new_update

New update