some changes
Merge branch 'master' of https://github.com/mynamesleon/responsiveCarousel

Conflicts:
	script/jquery.carouselps.min.js