player commit
modifs
Merge branch 'master' of https://github.com/yastij/ResXY

Conflicts:
	src/model/items/Item.java
Merge branch 'master' of https://github.com/yastij/ResXY
creation de la structure heritage/interface des rooms