modif 23:53
Merge commit '6b646200953a8460243afc7ed8daf707aa6c453e'

Conflicts:
	lol.txt