Petit commit
Merge remote-tracking branch 'origin/master2' into master2

Conflicts:
	PointeursNULL_GameJam2/Assets/Script/Timer.cs