Ajout d'obstacle ? (version alpha)
Merge branch 'master' of https://github.com/Chocobozzz/pup-framework

Conflicts:
	local/bin/wargame/src/wargame/Carte.java