J'ai renommé le répertoire OpenStudio -> Assets
Merge branch 'master' of https://github.com/touffies/html5-slides

Conflicts:
	assets/audio/cheval.mpeg
	assets/audio/cheval.ogg
	assets/css/custom.css
	assets/img/html5/HTML5_Logo_128.png
	assets/img/html5/tech/HTML5_3D_effects_128.png
	assets/img/html5/tech/HTML5_Connectivity_128.png
	assets/img/html5/tech/HTML5_Device_Access_128.png
	assets/img/html5/tech/HTML5_Multimedia_128.png
	assets/img/html5/tech/HTML5_Offline_Storage_128.png
	assets/img/html5/tech/HTML5_Performance_128.png
	assets/img/html5/tech/HTML5_Semantics_128.png
	assets/img/html5/tech/HTML5_Semantics_64.png
	assets/img/html5/tech/HTML5_Styling_128.png
	assets/img/opacity_bg.jpg
	assets/img/vendor_prefix.png
	assets/js/dnd-lib.js
	assets/video/film.mp4
	assets/video/film.ogg