minor fixes
Merge branch 'master' of https://github.com/jessonfoo/Survey_Gorilla_challenge into michael
Merge branch 'master' of https://github.com/jessonfoo/Survey_Gorilla_challenge into michael
survey result page
user cannot take survey twice
Merge pull request #15 from jessonfoo/michael

Michael
minor fixes
Merge pull request #16 from jessonfoo/michael

minor fixes
merge
fixed merge bugs
fixed stuff