modified:   pom.xml
	modified:   src/main/java/fr/paris7/gri/tp1/App.java
	modified:   src/main/java/fr/paris7/gri/tp1/Graph.java
	modified:   src/main/java/fr/paris7/gri/tp1/Utils.java
Merge branch 'master' of https://github.com/ziellim/GRI

Conflicts:
	src/main/java/fr/paris7/gri/tp1/App.java
	src/main/java/fr/paris7/gri/tp1/Graph.java
	modified:   README.md
	modified:   cc-uf
	new file:   clean
	new file:   install
	new file:   resources/week.node1
	new file:   resources/week.node2
	modified:   tp1/App.java
	modified:   tp1/Graph.java
	modified:   tp2/App.java
	modified:   tp2/Graph.java
	new file:   tp2/Resources.java
	modified:   src/main/java/fr/paris7/gri/tp2/Utils.java
	modified:   src/main/java/fr/paris7/gri/tp2/App.java
	deleted:    .bashrc