modified:   .gitignore
	new file:   R.txt
	new file:   S.txt
	modified:   src/com/paris7/adb/tp5/Data.java
Merge branch 'master' of https://github.com/ziellim/Join

Conflicts:
	R.txt
	S.txt
	modified:   .classpath
	modified:   .gitignore
	deleted:    R.txt
	deleted:    README.md
	deleted:    S.txt
	renamed:    RS.txt -> file/R.txt
	new file:   file/RS.txt
	new file:   file/S.txt
	modified:   src/com/paris7/adb/tp5/business/Data.java