Merge pull request #8 from bobleigh/master

oli a jour sur master
inscription
vider le dépot
Mise a jour complete
Merge branch 'Oli'

Conflicts:
	content/inscription.php