update
Merge branch 'master' of github.com:jackzhang1204/html5-slideshow-maker-free

Conflicts:
	README.md