none
none
Merge pull request #2 from hsandt/master

loader, state, sample...
petit truc
petit truc
fusion

Conflicts:
	engine/source/adventure/models.py
Modif models

Pb persistant : lors du test, impossible de loader l'image teapot.png
Merge pull request #5 from gustvgdt/master

modifications de models
added imports in __init__.py s
mise à jour
màj
test successful
Sourie
Merge pull request #6 from gustvgdt/master

Petites corrections suite au test
merged conflicts for test_game, sample, remodeling
merged oldies
Revert "deleted temp layeredview2.py"

This reverts commit 7093a6a5b0a92c1e18c09f4fdb8968b84144acf3.
renamed layeredview2 to layeredview
sample, ready to take item
take an item!