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

Conflicts:
	entity.py
Merge branch 'master' of github.com:ArnaudXXIX/banana
Nouveau menu, debut... C'est moche
Forme du code
Merge branch 'master' of github.com:ArnaudXXIX/banana