Update to level and Q*bert moves around (weirdly)
Merge branch 'master' of https://github.com/rvallejos/QbertRemake

Conflicts:
	Assets/Materials.meta
	Assets/Materials/Layer_03Mat.mat.meta
	Assets/Materials/QBERT_MESHMat.mat.meta
	Assets/Materials/Qbert-Render copy.png.meta
	Assets/Materials/cat_fur_closeup_9280187.JPG.meta
	Assets/Materials/defaultMat.mat.meta
	Assets/Materials/fourcolor.png.meta
	Assets/Materials/green_blue.png.meta
	Assets/Materials/magenta.png.meta
	Assets/Materials/material1.mat.meta
	Assets/Materials/red.png.meta
	Assets/Models.meta
	Assets/Models/Qbert_Model.obj.meta
	Assets/Models/cube_surface.mtl.meta
	Assets/Models/cube_surface.obj.meta
	Assets/Models/hex_surface.mtl.meta
	Assets/Models/hex_surface.obj.meta
	Assets/Models/octo_surface.mtl.meta
	Assets/Models/octo_surface.obj.meta
	Assets/Models/qbert1_surfaces.obj.meta
	Assets/Models/qbert1_towers.obj.meta
	Assets/Models/qbert_LEVEL1.3dm.bak.meta
	Assets/Models/qbert_LEVEL1.obj.meta
	Assets/Music.meta
	Assets/Music/Gamer Girl.mp3.meta
	Assets/Music/Level_1_TESTMusic.wav.meta
	Assets/Prefabs.meta
	Assets/Prefabs/Hexagon.prefab.meta
	Assets/Prefabs/Octogon.prefab.meta
	Assets/Prefabs/Square.prefab.meta
	Assets/Qbert_1.unity
	Assets/Qbert_1.unity.meta
	Assets/Scipts.meta
	Assets/Scipts/CollisionScript.js
	Assets/Scipts/CollisionScript.js.meta
	Assets/Scipts/PianoKeyScript.cs.meta
	Assets/Scipts/Surface.js.meta
	Assets/Scipts/TestController.cs
	Assets/Scipts/TestController.cs.meta
	Assets/Scipts/UI.js
	Assets/Scipts/UI.js.meta
	Assets/Sound Effects.meta
	Assets/Sound Effects/Level_1_Directions.meta
	Assets/Sound Effects/Level_1_Directions/A-B3.aif.meta
	Assets/Sound Effects/Level_1_Directions/C-A#3.aif.meta
	Assets/Sound Effects/Level_1_Directions/D-C4.aif.meta
	Assets/Sound Effects/Level_1_Directions/E-G#4.aif.meta
	Assets/Sound Effects/Level_1_Directions/Q-C#4.aif.meta
	Assets/Sound Effects/Level_1_Directions/W-D#4.aif.meta
	Assets/Sound Effects/Level_1_Directions/X-G#3.aif.meta
	Assets/Sound Effects/Level_1_Directions/Z-F3.aif.meta
	Assets/Sound Effects/OriginalSFX.meta
	Assets/Sound Effects/OriginalSFX/Ahop.wav
	Assets/Sound Effects/OriginalSFX/Ahop.wav.meta
	Assets/Sound Effects/OriginalSFX/Coily Over the edge.wav
	Assets/Sound Effects/OriginalSFX/Coily Over the edge.wav.meta
	Assets/Sound Effects/OriginalSFX/Extra Bert.wav
	Assets/Sound Effects/OriginalSFX/Extra Bert.wav.meta
	Assets/Sound Effects/OriginalSFX/Game start music.wav
	Assets/Sound Effects/OriginalSFX/Game start music.wav.meta
	Assets/Sound Effects/OriginalSFX/Hop.wav
	Assets/Sound Effects/OriginalSFX/Hop.wav.meta
	Assets/Sound Effects/OriginalSFX/Qbert Over the edge.wav
	Assets/Sound Effects/OriginalSFX/Qbert Over the edge.wav.meta
	Assets/Sound Effects/OriginalSFX/Ride the disk.wav
	Assets/Sound Effects/OriginalSFX/Ride the disk.wav.meta
	Assets/Sound Effects/OriginalSFX/Sware1.wav
	Assets/Sound Effects/OriginalSFX/Sware1.wav.meta
	Assets/Sound Effects/OriginalSFX/Sware2.wav
	Assets/Sound Effects/OriginalSFX/Sware2.wav.meta
	Assets/Sound Effects/OriginalSFX/Sware3.wav
	Assets/Sound Effects/OriginalSFX/Sware3.wav.meta
	Assets/Sound Effects/OriginalSFX/The Bite.wav
	Assets/Sound Effects/OriginalSFX/The Bite.wav.meta
	Assets/Sound Effects/OriginalSFX/bonk.wav
	Assets/Sound Effects/OriginalSFX/bonk.wav.meta
	Assets/Sound Effects/OriginalSFX/byebye.wav
	Assets/Sound Effects/OriginalSFX/byebye.wav.meta
	Assets/Sound Effects/OriginalSFX/coin Drop.wav
	Assets/Sound Effects/OriginalSFX/coin Drop.wav.meta
	Assets/Standard Assets.meta
	Assets/Standard Assets/Character Controllers.meta
	Assets/Standard Assets/Character Controllers/3rd Person
Controller.prefab.meta
	Assets/Standard Assets/Character Controllers/First Person
Controller.prefab.meta
	Assets/Standard Assets/Character Controllers/Sources.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Materials.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Materials/Constructor-09 -
Default.mat
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Materials/Constructor-09 -
Default.mat.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Materials/constructor_done.mat.me
ta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Textures.meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png.
meta
	Assets/Standard Assets/Character
Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png.
meta
	Assets/Standard Assets/Character Controllers/Sources/Scripts.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/CharacterMotor.js.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/FPSInputController.js.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/MouseLook.cs.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/PlatformInputController.js.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/ThirdPersonCamera.js.meta
	Assets/Standard Assets/Character
Controllers/Sources/Scripts/ThirdPersonController.js.meta
	Assets/Standard Assets/Scripts.meta
	Assets/Standard Assets/Scripts/Camera Scripts.meta
	Assets/Standard Assets/Scripts/Camera Scripts/MouseOrbit.js.meta
	Assets/Standard Assets/Scripts/Camera Scripts/SmoothFollow.js.meta
	Assets/Standard Assets/Scripts/Camera Scripts/SmoothLookAt.js.meta
	Assets/Standard Assets/Scripts/General Scripts.meta
	Assets/Standard Assets/Scripts/General Scripts/ActivateTrigger.cs.meta
	Assets/Standard Assets/Scripts/General Scripts/DragRigidbody.js.meta
	Assets/Standard Assets/Scripts/Utility Scripts.meta
	Assets/Standard Assets/Scripts/Utility Scripts/CombineChildren.cs.meta
	Assets/Standard Assets/Scripts/Utility
Scripts/MeshCombineUtility.cs.meta
	Assets/Standard Assets/Toon Shading.meta
	Assets/Standard Assets/Toon Shading/Sources.meta
	Assets/Standard Assets/Toon Shading/Sources/Shaders.meta
	Assets/Standard Assets/Toon
Shading/Sources/Shaders/Toony-Basic.shader.meta
	Assets/Standard Assets/Toon
Shading/Sources/Shaders/Toony-BasicOutline.shader.meta
	Assets/Standard Assets/Toon
Shading/Sources/Shaders/Toony-Lighted.shader.meta
	Assets/Standard Assets/Toon
Shading/Sources/Shaders/Toony-LightedOutline.shader.meta
	Assets/Standard Assets/Toon Shading/Sources/Textures.meta
	Assets/Standard Assets/Toon Shading/Sources/Textures/toon ramp.png.meta
	Assets/Standard Assets/Toon Shading/Sources/Textures/toony
lighting.psd.meta
	Assets/Standard Assets/Toon Shading/Toony-Basic.mat.meta
	Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat.meta
	Assets/Standard Assets/Toon Shading/Toony-Lighted Outline.mat.meta
	Assets/Standard Assets/Toon Shading/Toony-Lighted.mat.meta
	Assets/Standard Assets/Toon Shading/_ToonShadingSample.unity.meta
	Assets/qbert_LEVEL1.3dm.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/01/011f03f455afb4ffd944559009aebd5e
	Library/metadata/02/0240107c1a2c84f1db89eb88f647a86a
	Library/metadata/03/03ae01d7b681ecf4f971422f624b31cf
	Library/metadata/05/054a31a99d11e49d110086ba44295342
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	Library/metadata/0d/0d868c70289ad47b0b457a9836596d68
	Library/metadata/0e/0e5eb7ee6d8c848a9a522b0517ccb22a
	Library/metadata/0f/0f96df2092cc040ecb880a110553c5c3
	Library/metadata/13/13fba24e908fa4ed1b7a42ef638d35fe
	Library/metadata/15/15970da3b72060c4eb43bd1de7cb7613
	Library/metadata/1b/1b02b67596f8d2d48b53c357e1a3d294
	Library/metadata/1b/1bb00f11db78d47298597a2350c74e15
	Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	Library/metadata/1e/1e4018542f7666b4d8631699f0241f28
	Library/metadata/21/215977489d11178d11005b9844295342
	Library/metadata/21/217328d8099ef45dfa4f8f50b70c404a
	Library/metadata/22/226063fef88dae744ab0074ef2306b5c
	Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Library/metadata/27/27acebc9ad1110f6d00074c88d76c639
	Library/metadata/2a/2af3a4c92e4454f1c91f9fdf29292ca7
	Library/metadata/2c/2c1853ee4238b48cc80469e44141dead
	Library/metadata/2d/2d638c42012017f44a70c9228e28dd21
	Library/metadata/30/3039e9ebf2cd4dc45a6d99d01265a504
	Library/metadata/31/31179a6bbd11e2c3d000dc0b8d76c639
	Library/metadata/32/328c3a0be344c4e7fb8f3c0dc425fc47
	Library/metadata/38/38caec82e09190b4ab0a8fd7ecd6d39c
	Library/metadata/3c/3cadc5c144b6941fd9b94e6f6cbaa3cc
	Library/metadata/3e/3e77ed8ce8bd24e46b7538ef0c1a916d
	Library/metadata/3f/3f15da00be15f4711873cce27ffeeee2
	Library/metadata/3f/3f54ec8bf066c465ba611b0991d4266e
	Library/metadata/41/41c2dc50acab34a7594d5e7a0a3fe8f8
	Library/metadata/42/42a1ff725be44471794dea03c8f1c4b0
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/48/48269d2bfc00b486c80cfdf8369a75d4
	Library/metadata/48/48dca5b99d113b8d11006bab44295342
	Library/metadata/4a/4a056241e2722dc46a7262a8e7073fd9
	Library/metadata/4d/4d48bf87d37b5442bb9d7f5c4f3f6ff7
	Library/metadata/51/51757aa3ece6a414e925f4e6203fb504
	Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/55/553a7e78e816344d0a3ac0d816e93008
	Library/metadata/55/55bd1669054cf498da71e022c89398c8
	Library/metadata/5a/5a91ff3af0b884be096d4a29b2499a92
	Library/metadata/5d/5d63a1abb44ac41d39dcc41c9f3c147e
	Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	Library/metadata/5e/5e2241b042fde470bb5db13e1b0041f0
	Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Library/metadata/63/638a96919d466466f8abaa6ff636ec10
	Library/metadata/63/63c8b240b0e3d4c8cbd0b5297bcf743e
	Library/metadata/64/6412e041c8ad74c9fab8dbe0b724f97c
	Library/metadata/65/651770f8be26443fdb85aa3594fa349c
	Library/metadata/66/6685d213dcd37451eaa7643f63089046
	Library/metadata/66/66e0989f9d113e2d110016e844295342
	Library/metadata/67/67525687136104a69912190321e4b30a
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/69/69bccc250f0dd4b7dbe1d52259cf2b42
	Library/metadata/76/7687b0af793d17144a5f7145bfdb192a
	Library/metadata/77/77a7019133e6e4607b845e358cd38a77
	Library/metadata/79/79a0ecef2629940f683deeb12c53b9e7
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/80/80941e096c20297498b66bebe8d12461
	Library/metadata/80/80f197d4e3f08497a88d0cc8302df91a
	Library/metadata/83/8342985f0bf54422ca0f11bb7e37a0a1
	Library/metadata/83/838af591984514859b747a048bea2e5e
	Library/metadata/84/84b9e1d19d11078d11005b9844295342
	Library/metadata/86/8636e662e0f7d440fa257e9dce592504
	Library/metadata/88/885b1972ad11a921d000d37b8d76c639
	Library/metadata/8a/8a4debc9ad1110f6d00074c88d76c639
	Library/metadata/8a/8aa9f8f5c4ea2473ebe02166680f7644
	Library/metadata/8b/8b8ba88cbd11e2c3d000dc0b8d76c639
	Library/metadata/92/92344036cea724cb8a81fb51ecbb7b9f
	Library/metadata/95/95b08ce61b0814944a91a4033f5ed1e9
	Library/metadata/96/9676182a5d91fc14ea1d6bba71c7152b
	Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Library/metadata/99/99b2fd4ad9b68f344a90a61feb9f8966
	Library/metadata/9c/9ce107479d11178d11005b9844295342
	Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Library/metadata/a0/a07bdc2d888e37d418b3cb78acd587db
	Library/metadata/a1/a18ee59f08d29453f90308d50eb0c912
	Library/metadata/a3/a3df117baed3e4d7f9cceac4eb49b163
	Library/metadata/a4/a40a953a971b047e080da4a57f6b611d
	Library/metadata/ad/addb99dc8bcf64b36908a574e5358a5d
	Library/metadata/ad/adec466a1f9044ea78471a5ce6f78271
	Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Library/metadata/b3/b3cceb6e99523574a8aede4b0285fcc1
	Library/metadata/b7/b72caabf12c331640acd2b271eb26541
	Library/metadata/b7/b76c3d834879f43fa82b9a4b26dc36ec
	Library/metadata/b9/b995d4bd9d11078d11005b9844295342
	Library/metadata/bd/bda78ec5b418849ebbd053237cc5318a
	Library/metadata/bd/bdb2ce4be13a89141bdb573f4caa612c
	Library/metadata/bf/bfba881483add4f55934b0c8b0fc75d4
	Library/metadata/bf/bfd117f85ada840268202dfe33bb214b
	Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Library/metadata/c8/c8634e062924929664361c08745211fb
	Library/metadata/c9/c9e6294c9d11cb8d11006bf944295342
	Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Library/metadata/ca/cae09c86ad1122e5d0006ac98d76c639
	Library/metadata/d2/d238579908a3647dfa39bc12a72393e7
	Library/metadata/d3/d3b2307d2fc22404799f986695b8c6b1
	Library/metadata/d5/d5b825a872c724ee4b68cb7f6aebcf72
	Library/metadata/d6/d6d6bb2405fae4beab3eef55dd4f20eb
	Library/metadata/d8/d84268709d11078d11005b9844295342
	Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Library/metadata/e6/e6181a72232854458b8629689a7fe23b
	Library/metadata/e7/e7149d154487d434992bca8c0b7c3a26
	Library/metadata/e8/e8e87547102bc4126b5b7145acf8c2ba
	Library/metadata/e9/e9029ac82c055458c8fbc9ddd7476e8f
	Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Library/metadata/f7/f79039b11e3172e42a84e4d9dc613e1d
	ProjectSettings/InputManager.asset
	ProjectSettings/Physics2DSettings.asset
	ST_QBertRemake-csharp.sln
	ST_QBertRemake.sln
	ST_QBertRemake.userprefs