new file:   src/com/paris7/adb/tp6/business/ADB
	modified:   src/com/paris7/adb/tp6/business/DataManager.java
	modified:   src/com/paris7/adb/tp6/business/JoinMaker.java
	modified:   src/com/paris7/adb/tp6/business/RGenerator.java
	modified:   src/com/paris7/adb/tp6/presentation/App.java
	modified:   src/com/paris7/adb/tp6/test/JoinTest.java
	modified:   src/com/paris7/adb/tp6/test/RGeneratorTest.java
Merge branch 'master' of https://github.com/ziellim/ADB

Conflicts:
	bin/.gitignore
	bin/R/R00.txt
	bin/R/R01.txt
	bin/R/R02.txt
	bin/R/R03.txt
	bin/R/R04.txt
	bin/R/R05.txt
	bin/R/R06.txt
	bin/R/R07.txt
	bin/R/R08.txt
	bin/R/R09.txt
	bin/R/R10.txt
	bin/R/R11.txt
	bin/R/R12.txt
	bin/R/R13.txt
	bin/R/R14.txt
	bin/R/R15.txt
	bin/R/R16.txt
	bin/R/R17.txt
	bin/R/R18.txt
	bin/R/R19.txt
	bin/R/R20.txt
	bin/RS/RS0.txt
	bin/RS/RS1.txt
	bin/RS/RS2.txt
	bin/RS/RS3.txt
	bin/RS/RS4.txt
	bin/RS/RS5.txt
	data/R/R00.txt
	data/R/R01.txt
	data/R/R02.txt
	data/R/R03.txt
	data/R/R04.txt
	data/R/R05.txt
	data/R/R06.txt
	data/R/R07.txt
	data/R/R08.txt
	data/R/R09.txt
	data/R/R10.txt
	data/R/R11.txt
	data/R/R12.txt
	data/R/R13.txt
	data/R/R14.txt
	data/R/R15.txt
	data/R/R16.txt
	data/R/R17.txt
	data/R/R18.txt
	data/R/R19.txt
	data/R/R20.txt

	renamed:    src/com/paris7/adb/tp6/business/DataManager.java -> src/com/paris7/adb/tp7/business/DataManager.java
	renamed:    src/com/paris7/adb/tp6/business/RGenerator.java -> src/com/paris7/adb/tp7/business/RGenerator.java
	renamed:    src/com/paris7/adb/tp6/business/JoinMaker.java -> src/com/paris7/adb/tp7/business/SortMaker.java
	renamed:    src/com/paris7/adb/tp6/presentation/App.java -> src/com/paris7/adb/tp7/presentation/App.java
	renamed:    src/com/paris7/adb/tp6/test/JoinTest.java -> src/com/paris7/adb/tp7/test/JoinTest.java
	renamed:    src/com/paris7/adb/tp6/test/RGeneratorTest.java -> src/com/paris7/adb/tp7/test/RGeneratorTest.java
	new file:   src/com/paris7/adb/tp7/test/SortTest.java