Video Strasbourg
Merge branch 'master' of github.com:scemama/scemama.github.io

Conflicts:
	index.html