Resolution des Conflicts:
	src/main/java/main/MainWiki.java
	src/main/java/wiki/WikiReader.java