merged with master
Merge branch 'master' into gh-pages

Conflicts:
	js/HTMLSlides.min.js
	slides.html
Merge branch 'master' into gh-pages
addes slides.html
fixed resize problem
changed slide resize to use parent width instead of slide width