Merge pull request #12 from aarondufall/mjm

more
Merge pull request #13 from aarondufall/mjm

Survey erb added
connected pages to controller and javascript. user authentication is not hooked up
Merge branch 'master' of https://github.com/aarondufall/survey-monkey into new_Feature
controller view and models all hooked up
Merge pull request #14 from aarondufall/new_Feature

New feature
fixed auth
login form params fixed
delete test file
trivial changes to views
applied styling
Merge pull request #15 from aarondufall/desgin

applied styling
survey_controller
resolving merge conflict
minor changes to actions after login