Pathfinding des monstres
Résolution de merge pathfinding -> echarpe
résolution de conflit 2
maj gitignore et résolution de conflit (enfin?)
correction
Merge branch 'master' of https://github.com/Wambou/GGJ2014

Conflicts:
	.gitignore
	Construct2/APOIL_GGJ_2014.caproj
	Construct2/APOIL_GGJ_2014.capx.backup1
	Construct2/Event sheets/Event sheet 1.xml
	Construct2/Layouts/Layout 1.xml
résolution enfin...

Merge branch 'master' of https://github.com/Wambou/GGJ2014

Conflicts:
	Construct2/APOIL_GGJ_2014.caproj
	Construct2/Layouts/Layout 1.uistate.xml