we
Merge origin/GraphYorick

Conflicts:
	src/main/java/main/ManagerGraph.java
Merge origin/GraphYorick

Conflicts:
	src/main/java/main/ManagerGraph.java