reparation
et la ça répare ?
test3
Merge branch 'master' of https://github.com/ProjetPict/Application

Conflicts:
	Database/database.sql
	Serveur/src/Connection.java
	Serveur/src/Player.java
	Serveur/src/Server.java