sheridan project settings
modified scene to make binding work?
metas
Merge branch 'master' of https://github.com/threeup/Tetrified

Conflicts:
	Assets/Code.meta
	Assets/Code/CameraParams.cs.meta
	Assets/Code/EventArgs.cs.meta
	Assets/Code/GameGrid.cs.meta
	Assets/Code/GameParams.cs.meta
	Assets/Code/GameRules.cs.meta
	Assets/Code/LXComplex.cs.meta
	Assets/Code/LXEntity.cs.meta
	Assets/Code/LXGrabber.cs.meta
	Assets/Code/LXGroup.cs.meta
	Assets/Code/LXGroupList.cs.meta
	Assets/Code/LXManager.cs.meta
	Assets/Code/PieceParams.cs.meta
	Assets/Code/PuzzleParams.cs.meta
	Assets/Code/TetrCube.cs.meta
	Assets/Code/TetrGame.cs.meta
	Assets/Code/TetrGameData.cs.meta
	Assets/Code/TetrGameState.cs.meta
	Assets/Code/TetrInventory.cs.meta
	Assets/Code/TetrManager.cs.meta
	Assets/Cube.prefab.meta
	Assets/Factory.prefab
	Assets/Factory.prefab.meta
	Assets/Materials.meta
	Assets/Materials/AlphaCube.mat.meta
	Assets/Materials/BackgroundBackdrop.mat.meta
	Assets/Materials/BackgroundTest.mat.meta
	Assets/Materials/BoardEdge.mat.meta
	Assets/Materials/BoardFloor.mat.meta
	Assets/Materials/BoardFloorHit.mat.meta
	Assets/Materials/Everything.physicMaterial.meta
	Assets/Materials/Flag.mat.meta
	Assets/Materials/FlagBackdrop.mat.meta
	Assets/Materials/Logo.mat.meta
	Assets/Materials/No Name.mat.meta
	Assets/Materials/SolidCube.mat.meta
	Assets/Models.meta
	Assets/Models/AlphaCube.fbx.meta
	Assets/Models/AmericanBoard.dae.meta
	Assets/Models/Cube.fbx.meta
	Assets/Models/CubeFrame.prefab.meta
	Assets/Models/Materials.meta
	Assets/Models/Materials/_0111_SlateGray_.mat.meta
	Assets/Models/Materials/material.mat.meta
	Assets/Models/american-flag.jpg.meta
	Assets/Models/american-flag1.jpg.meta
	Assets/Scenes.meta
	Assets/Scenes/main.unity
	Assets/Scenes/main.unity.meta
	Assets/Textures.meta
	Assets/Textures/BlueStripe.png.meta
	Assets/Textures/Board.jpg.meta
	Assets/Textures/BoardTest.png.meta
	Assets/Textures/Clouds.png.meta
	Assets/Textures/Dynamic.meta
	Assets/Textures/Dynamic/Board.jpg.meta
	Assets/Textures/Dynamic/BoardTest.png.meta
	Assets/Textures/Dynamic/Box - Copy.png.meta
	Assets/Textures/Dynamic/Box.png.meta
	Assets/Textures/Dynamic/Box3.png.meta
	Assets/Textures/Dynamic/Box4.png.meta
	Assets/Textures/Dynamic/Box5.png.meta
	Assets/Textures/Dynamic/Box6.png.meta
	Assets/Textures/Dynamic/BoxPlain.png.meta
	Assets/Textures/Dynamic/outerBox.png.meta
	Assets/Textures/Dynamic/whiteBox.png.meta
	Assets/Textures/american-flag.jpg.meta
	Assets/Textures/american-flag1.jpg.meta
	Assets/Textures/bluePixel.png.meta
	Assets/Textures/brownlines.png.meta
	Assets/Textures/grass1.png.meta
	Assets/Textures/greenPixel.png.meta
	Assets/Textures/lightmap.tga.meta
	Assets/Textures/noPixel.png.meta
	Assets/Textures/rustic.jpg.meta
	Assets/Textures/testlogo.png.meta
	Assets/Textures/testtexture.png.meta
	Assets/Textures/watery.png.meta
	Assets/Textures/whitePixel.png.meta
	Assets/Textures/whitePixel128.png.meta
	ProjectSettings/AudioManager.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/EditorSettings.asset
	ProjectSettings/InputManager.asset
	ProjectSettings/NavMeshLayers.asset
	ProjectSettings/NetworkManager.asset
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
	ProjectSettings/TagManager.asset
	ProjectSettings/TimeManager.asset