TI et RMI
Merge branch 'master' of github.com:ruytoor/M1S2

Conflicts:
	workspace/RMI/src/test/MyTest.java