ninja walk


Signed-off-by: Mickael PURET <puret_mickael@yahoo.fr>
Merge branch 'master' of https://github.com/Cepheus/Short-Story

Conflicts:
	src/Scene.cpp
checkout :(


Signed-off-by: Mickael PURET <puret_mickael@yahoo.fr>
Le ninja marche


Signed-off-by: Mickael PURET <puret_mickael@yahoo.fr>
Merge branch 'master' of https://github.com/Cepheus/Short-Story