git(merge) : fix conflicts.
Merge pull request #28 from adurieux/master

feature(css) : minor.