Test classpath
Merge branch 'master' of https://github.com/joe-hache/BDA2_billets_train.git
Merge branch 'master' of
https://github.com/joe-hache/BDA2_billets_train.git

Conflicts:
	Billets_train/src/fr/unice/polytech/si5/bda2/queries/Queries.java
	Billets_train/src/fr/unice/polytech/si5/bda2/queries/TestMain.java