Fix problème d'arche
diminution du shake
Merge branch 'master' of https://github.com/Natsirtt/bugfree-happiness

Conflicts:
	gameManager.lua
Merge branch 'master' of https://github.com/Natsirtt/bugfree-happiness