modif 2
Merge commit '8de97ba98c005f7cf2f69846572cf8a855ddaf40'

Conflicts:
	lol.txt