Simplify
Merge branch 'master' of https://github.com/edmondsnadane/Projet-R-D

Conflicts:
	Site/js/heure.js