Merge branch 'master' of https://github.com/alex124/tp4
Merge branch 'master' of https://github.com/alex124/tp4
Merge branch 'master' of https://github.com/alex124/tp4
Merge branch 'master' of https://github.com/alex124/tp4

Conflicts:
	src/Inventaire.java
Merge branch 'master' of https://github.com/alex124/tp4

Conflicts:
	src/Carte.java
	src/Inventaire.java