Fix controller bug, fix Take Survey view
Merge pull request #26 from chriswoodrich/bugfix

Fix controller bug, fix Take Survey view