jquery and javascript on question page
fixed merge conflicts in create survey controller
Merge pull request #13 from kexline4710/javaScript

jquery and javascript on question page