Scripts folders
Settings container

Conflicts:
	Assets/Scenes/hex.unity
	Assets/Scripts/GUI/PauseController.cs
Merged scene file