merging jack's changes
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch
fixed taking survey breaking on unnecessary user id assignment, and incorrect view
Merge pull request #37 from wisconsinpoet/bird_branch

Bird branch