updated the view results page
fixed merge conflict
formatting
Merge pull request #23 from fiddler-crabs-2014/chore/html

Chore/html