modified:   tp3/Main.java
Merge branch 'master' of https://github.com/ziellim/ProgRepar

Conflicts:
	src/main/java/fr/paris7/progrepar/tp3/Main.java
	new file:   latex/tp3.tex