edit
Merge branch 'edit' of github.com-tbl123:vividJS/vividSlider into edit

Conflicts:
	README.md
	demo/css/style.css
	demo/templates/defaultSlider.html
	demo/templates/tiledBgSlider.html
	index.html