man css, correction suite aux test, …
Merge branch 'master' of https://github.com/yakunkun/desksurfing

Conflicts:
	index.html