ch
Merge branch 'master' of https://github.com/Elendol/JAVE

Conflicts:
	puitsinfo.php

	new file:   analyser.php
	new file:   calcult.php
	modified:   connexion.php
	modified:   donnees.php
	modified:   donnees_histo.php
	new file:   fonctions/fonctions_analyse.php
	deleted:    fonctions/fonctions_historique.php
	modified:   fonctions/fonctions_import.php
	new file:   graphe.dot
	deleted:    historique.php
	deleted:    includes/form_analyse.html
	new file:   includes/form_analyse.php
	modified:   includes/header.php
	modified:   includes/sidebar.php
	modified:   index.php
	modified:   inscription.php
	new file:   main_correlation.php
	modified:   partie_privee.php