Adding in Credits Scene
updating my gitingore
Merge branch 'master' of github.com:headdetect/Wheelsomnia

Conflicts:
	Assets/Graphics/Models/Materials/Block.mat.meta
	Assets/Graphics/Models/Materials/Triangle.mat.meta
	Assets/Graphics/Models/Materials/Wheel.mat.meta
	Assets/Graphics/Models/ToolBlock.fbx.meta
	Assets/Graphics/Models/ToolTriangle.fbx.meta
	Assets/Graphics/Models/Wheel.fbx.meta
	Assets/Graphics/Textures/Boost_Fast.png.meta
	Assets/Graphics/Textures/Boost_Slow.png.meta
	Assets/Graphics/Textures/Funnel.png.meta
	Assets/Graphics/Textures/Magnet_Attract.png.meta
	Assets/Graphics/Textures/Magnet_Repel.png.meta
	Assets/Graphics/Textures/MenuBackground.mat.meta
	Assets/Graphics/Textures/SplashScreen.png.meta
	Assets/Graphics/Textures/Spring.png.meta
	Assets/Graphics/objecttypes.xml.meta
	Assets/JSON Tests.meta
	Assets/JSON Tests/CSharp.meta
	Assets/JSON Tests/CSharp/TestScene_CSharp.unity.meta
	Assets/JSON Tests/CSharp/Test_CSharp.cs.meta
	Assets/JSON Tests/TroubleShoot.txt.meta
	Assets/JSON Tests/UnityScript.meta
	Assets/JSON Tests/UnityScript/TestScene_UnityScript.unity.meta
	Assets/JSON Tests/UnityScript/Test_UnityScript.js.meta
	Assets/Prefabs.meta
	Assets/Prefabs/Block.prefab.meta
	Assets/Prefabs/Triangle.prefab.meta
	Assets/Prefabs/Wheel.prefab.meta
	Assets/Projects.meta
	Assets/Projects/Blender.meta
	Assets/Projects/Blender/Goal.blend.meta
	Assets/Projects/Blender/Materials.meta
	Assets/Projects/Blender/Materials/BlackCheckers.mat.meta
	Assets/Projects/Blender/Materials/Material.mat.meta
	Assets/Projects/Blender/Materials/PoleColor.mat.meta
	Assets/Projects/Blender/Materials/WhiteCheckers.mat.meta
	Assets/Projects/Blender/Materials/unnamed.mat.meta
	Assets/Projects/Blender/ToolBlock.blend.meta
	Assets/Projects/Blender/ToolTriangle.blend.meta
	Assets/Projects/Blender/UV Maps.meta
	Assets/Projects/Blender/UV Maps/ToolBlock.png.meta
	Assets/Projects/Blender/UV Maps/ToolTriangle.png.meta
	Assets/Projects/Blender/UV Maps/Wheel.png.meta
	Assets/Projects/Blender/Wheel.blend.meta
	Assets/Projects/Photoshop.meta
	Assets/Projects/Photoshop/BoostThing.psd.meta
	Assets/Projects/Photoshop/Funnel.psd.meta
	Assets/Projects/Photoshop/Magnet_Repel.psd.meta
	Assets/Projects/Photoshop/Spring.psd.meta
	Assets/Resources.meta
	Assets/Resources/test.json.meta
	Assets/SplashScreen.unity.meta
	Assets/Standard Assets/Resources.meta
	Assets/Standard Assets/Scripts/General Scripts/MapMaker.cs.meta
	Assets/Standard Assets/Scripts/General Scripts/MenuExitBtn.cs.meta
	Assets/Standard Assets/Scripts/General Scripts/MenuStartBtn.cs.meta
	Assets/Standard Assets/Scripts/General Scripts/SplashScreenDelay.cs.meta
	Assets/Tiled2Unity.meta
	Assets/Tiled2Unity/Imported.meta
	Assets/Tiled2Unity/Materials.meta
	Assets/Tiled2Unity/Meshes.meta
	Assets/Tiled2Unity/Prefabs.meta
	Assets/Tiled2Unity/Scripts.meta
	Assets/Tiled2Unity/Scripts/Editor.meta
	Assets/Tiled2Unity/Scripts/Runtime.meta
	Assets/Tiled2Unity/Shaders.meta
	Assets/Tiled2Unity/Textures.meta
	Assets/plugins.meta
	Assets/plugins/ICSharpCode.SharpZipLib.dll.meta
	Assets/plugins/SimpleJSON.cs.meta
Merge branch 'master' of github.com:headdetect/Wheelsomnia