cam

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' into fguilleminot

Conflicts:
	Unity/Assets/Scripts/Game/Game.cs

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' into fguilleminot
cam scrum

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
fix

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' into fguilleminot

Conflicts:
	Unity/Assets/Scene/terrain.unity

theirs

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Scene avec les touches et la caméra de scrum

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>