anim mort
Merge branch 'master' of https://github.com/FloFrancois/The_Working_Day

Conflicts:
	Projet/Sources/js/states.js
Merge branch 'master' of https://github.com/FloFrancois/The_Working_Day

Conflicts:
	Projet/Sources/js/states.js