Merge remote-tracking branch 'origin/oconne' into oconne

Conflicts:
	css/custom.css
	why.html

fix responsive

------
Merge remote-tracking branch 'origin/oconne' into oconne

Conflicts:
	css/custom.css
	videos.html
	why.html

oil

lool
Revert "Merge remote-tracking branch 'origin/oconne' into oconne"

This reverts commit d5f1a1bcb8e969b98ba1a1fcba453f65745f63b5.
Merge remote-tracking branch 'origin/oconne' into oconne

Conflicts:
	videos.html
Merge remote-tracking branch 'origin/oconne' into oconne

Conflicts:
	videos.html
fix responsive

-----------
Merge branch 'develop'

Conflicts:
	css/custom.css
	videos.html
	why.html
Merge branch 'oconne'