fixed Settings
Merge branch 'master' of https://github.com/VoidCatz/3D2048

Conflicts:
	src/Form1.cs
	src/Logic/GameState.cs
Merge branch 'master' of https://github.com/VoidCatz/3D2048