Merge pull request #2 from fiery-skippers-2014/Create_survey_AJAX

Changed answers to choices in models and migrations
Satisfying Routes

* Renaming controller files
* Work on user and survey forms
Merge pull request #3 from fiery-skippers-2014/Satisfying_Routes

Satisfying Routes
creating questions
fixed merge conflicts
fixed some redundancies in the layout file
fixed the multiple question input fields bug