rien.
Merge branch 'master' of https://github.com/ArnaudXXIX/banana

Conflicts:
	item.py
Merge branch 'master' of https://github.com/ArnaudXXIX/banana

Conflicts:
	entity.py