merging
Merge branch 'master' of github.com:stevenpy/carousel-test
adding sliders + maps