cleaned code in show and text in answer, fixed end vs ul list issue
fixed merge conflict with show formatting
css
Merge pull request #48 from catherinev/update_views

Update views
Merge pull request #49 from catherinev/monicas_test

Monicas test
css
Merge branch 'master' of https://github.com/catherinev/OurProject into monicas_test

because someone added to it.