Correction sur le HTML et CSS.
Merge branch 'master' of https://github.com/Elthum/picasso into Elthum-master

Conflicts:
	index.php
	res/css/main.css
	res/scss/main.scss