Nico adds CSS
Manu adds Javascript
Merge branch 'manu-js'