Merge branch 'master' of https://github.com/jpberry0623/survey_gorilla into molly

my own changes
fix error on homepage
Merge pull request #45 from jpberry0623/molly

Molly