.

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' of https://github.com/sylafrs/rugby
.

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' of https://github.com/sylafrs/rugby
.
Merge branch 'master' of https://github.com/sylafrs/rugby
transfo v2

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

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
Merge branch 'master' of https://github.com/sylafrs/rugby
Merge branch 'master' into buguee
.

Signed-off-by: Florian <Florian.guilleminot@gmail.com>
drop nouvelle version

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

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

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/MiniGames/TransformationManager.cs
	Unity/Assets/Scripts/Game/Playground/Gamer.cs
toMerge
Merge branch 'merging' into buguee
merge

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

Conflicts:
	Unity/Assets/Scene/terrain.unity
	Unity/Assets/Scripts/Game/Playground/Ball/Ball.cs
	Unity/Assets/Scripts/Game/Playground/Unit/Team.cs