correct
Merge branch 'master' of https://github.com/RobinDumontChaponet/synthese

Conflicts:
	src/includes/dbConnection.inc.php