no message
Merge branch 'master' of https://github.com/aCarriches/simple-slideshow

Conflicts:
	README.md