Changed the rock template to edit "About Me" box in settings.php
Revert "Changed the rock template to edit "About Me" box in settings.php"

This reverts commit 23346a4244554126d3e499a2e388a8628e7274b5.
Changed the rock template to edit "About Me" box in settings.php

(made a mistake previously)
Merge branch 'master' into chouffy-website

Conflicts:
	settings.php
MàJ du message dans "A propos"