Merge conflict
Merge branch 'master' of https://github.com/Bomberman-Epitech-Nice/Bomberman

Conflicts:
	Bomberman/Library/CurrentLayout.dwlt