Gros commit déguelasse de Thomas
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	hello.html
	index.html
	style.css