Modify the code based on the comments made by Ariane1
Merge origin/master

Conflicts:
	src/a2/tp4/database/Main.java
	src/a2/tp4/socket/Main.java
Merge origin/master

Conflicts:
	src/a2/tp4/database/Main.java
	src/a2/tp4/socket/Main.java