few un-commited changes
Merge branch 'master' of https://github.com/Joker-SMF/simple-carousel

Conflicts:
	index.html
	js/carousel.js