survey_controller
resolving merge conflict
minor changes to actions after login
Merge pull request #16 from aarondufall/mjm

Minor changes to login action