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

Update views