Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'gameState' of git@github.com:sylafrs/rugby.git into gameState

Conflicts:
	Unity/Assets/Scripts/Game/Playground/Game/States/RunningState.cs
Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'gameState' of git@github.com:sylafrs/rugby.git into gameState

Conflicts:
	Unity/Assets/Scripts/Game/Global/GameUIManager.cs
	Unity/Assets/Scripts/Game/Global/GameUIManager.cs.meta
	Unity/Assets/Scripts/Game/Global/Gamer.cs
	Unity/Assets/Scripts/Game/MiniGames/scrumController.cs
	Unity/Assets/Scripts/Game/Playground/Game/GameUIManager.cs.meta
	Unity/Assets/Scripts/Game/Playground/UI/UIManager.cs.meta
	Unity/Assets/Scripts/Settings/GameSettings.cs

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>
Merge branch 'gameState' of git@github.com:sylafrs/rugby.git into gameState