serveur.php devien facturation.php
upload fin de journer cegep
Merge origin/gh-pages into gh-pages

Conflicts:
	violette/public_html/js/main.js