Add slideshow to main page
merge conflict in application.html.erb