#18 Correction pour checkstyle
Merge branch 'dev2' of https://github.com/Tartofraize/TSaaP-parser.git
into dev2

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