home and slides page
Merging in changes