added description carousel and removed popup
fixed bugs and added rough draft of tour show
h1 edit
fixed merge conflict between slides branch
fixing merge