test
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Tp1/src/ift615tp1/Arbre.java
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'