a
c


Signed-off-by: Joey Peau <joey.peau@gmail.com>


Signed-off-by: Joey Peau <joey.peau@gmail.com>


Signed-off-by: Joey Peau <joey.peau@gmail.com>
Merge branch 'master' into member

Conflicts:
	.settings/org.eclipse.jdt.ui.prefs
	bin/Model/Merchant/Marchand.class
	src/Model/item/Equipment/protection/armor/UltraArmor.java
	src/Model/item/ItemLister.java

Signed-off-by: Joey Peau <joey.peau@gmail.com>