merging jack's changes
Merge branch 'master' of https://github.com/wisconsinpoet/Survey-Sloth into bird_branch
Merge pull request #36 from wisconsinpoet/lauren

Lauren
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
changes to sign in sign up duplication between nav bar and index - sign in and sign up relegated to index
Merge pull request #38 from wisconsinpoet/bird_branch

changes to sign in sign up duplication between nav bar and index - sign ...
controller stuff