test de trucs
Merge branch 'master' of https://github.com/Cepheus/Short-Story

Conflicts:
	src/InputListener.cpp