dfb
Merge branch 'master' of https://github.com/penouille/Stratego-ucl.git

Conflicts:
	src/Pion/Demineur.java
	src/Pion/Drapeau.java
	src/Pion/Marechal.java