inscription
Merge branch 'Oli'

Conflicts:
	content/inscription.php
essai
gogo
tabarnackkkkkkkkkkkkkkk
calissss
essai 2
essai 2 2
ciboire
Merge pull request #11 from bobleigh/master

version beta