merge errors
Bugfix: Answer form rendering in every div and render mock index view

After the merge, the javascript was adding the answer form to every div.
Fixed it by adding a class to the answers div.

Also created a very simple rendering of the surveys list on the answer
page with dummy data for the surveys.
Implemented rough index page view.

In it's most basic form, the index page is a list of surveys. We
added a very rough view of an index page.
Added rough outline of survey view

Added route gets 'survey/id' This gets the survey and displays it.
We listed all of the questions and all of the answers for each question.

Right now this is a static page. We have not added form elements.
Turned display_survey.erb into a form and implemented dummy post route

Our view to display the survey, display_survey.erb, now is a fully
functional form.  The form data posts to a dummy post route
post "/surveys"
Added a hidden field to survey to pass survey_id to post route

Implemented a post route
Added a hidden field called survey_id to display_survey.erb so that
we can pass enough information to the post route '/surveys' for it
to create Results.
Finished feature: take a survey

Completed wiring up survey veiw to post route. Post route '/surveys'
now creates a Participant and a bunch of survey Results and sticks
them in the database, representing a completed survey. The route then
redirects to the main surveys page.
Bugfix: fixed index page so survey links navigate to page

Index page survey links now navigate to the appropriate survey. Yay!
Started dashboard
Merge branch 'master' into TLR-KJF/Survey-takers-section

Fixed merge conflict in application.js.
Deleted spare logout button.

Conflicts:
	public/js/application.js
Fixed create survey link

Changed the create survey link to hit the route 'create' instead of surveys/new
Merge branch 'master' of https://github.com/tararoys/SurveyDBC

Fix merge conflicts. Specifically, deleted whitespace in application.js
and untangles our colliding routes in survey.rb Routes should not
end up inside eachother in a merge.

Conflicts:
	app/controllers/survey.rb
	public/js/application.js