Fixed merge conflict
Fixes merge conflict in application.css
Makes CSS for results page and take survey page consist with the rest of the app
Merge pull request #16 from qsymmachus/survey-css

Updates take survey and survey results