Nothing
Merge branch 'master' of https://github.com/Gaspi/Projet-INF431.git

Conflicts:
	Java Workspace/Test Hash/src/drafts/SlidingWindow.java
Merge branch 'master' of https://github.com/Gaspi/Projet-INF431.git