add submit survey function
fix conflict
fix conflict
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
fix conflict
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
back end integration
Merge remote-tracking branch 'origin/master' into herbert/backend-integration
Merge pull request #15 from charleschu/herbert/backend-integration

Herbert/backend integration