Version V4 - Synchronization of Slides with master
Merge branch 'master' of https://github.com/aurelien/Slides-Dynamiques

Conflicts:
	public/css/style.css
	public/index.html
	public/js/video.js
	public/video.html
	server.js