Pre-merge Commit
Merge branch 'master' of https://github.com/cassiemoy/survey_gorilla_group_project into dylan
User Model Update
changed routing for sessions in the user controller to match forms in index view
Merge pull request #19 from cassiemoy/dylan

Dylan
Merge pull request #20 from cassiemoy/derek

changed routing for sessions in the user controller to match forms in in...
Merge with master, fix merge conflicts