r24 Fixed global lighting. It NOW works properly.
r25 Changed the way VPL intensity calculates
r26 Finally figured out light intensity for VPL
r27 Small changes for testing
r28 Caught up with master, as far as merges go. Modified geometry for my own testing.
r29 Implemented cube object. Draws and spawns cube, intersect coming next.
r30 Cube object draws itself as a single shape. Intersections need to be improved to cast full shadows.
r31 Shoddy cube object.
r32 Blob class started.
r33 Beginning to work Blob in with our code.
r34 Blobs are woooooorking
r35 Reorganized scene somewhat
r36 Changed VPL to distribute lights better
Merge commit '29cd9247ab65cf51b6d51002a9dec6cb84b42637'

Conflicts:
	Funky/Funky.v11.suo
	Funky/Funky/DrawGeometry.cs
	Funky/Funky/Funky.csproj
	Funky/Funky/MainPage.xaml.cs
	Funky/Funky/RayTracer.cs
	Funky/Funky/Triangle.cs
	Funky/Funky/bin/Debug/AppX/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/bin/Debug/AppX/SharpDX Toolkit WinRT (XAML).pdb
	Funky/Funky/bin/Debug/AppX/vs.appxrecipe
	Funky/Funky/bin/Debug/Funky.build.appxrecipe
	Funky/Funky/bin/Debug/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/bin/Debug/SharpDX Toolkit WinRT (XAML).pdb
	Funky/Funky/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Funky/Funky/obj/Debug/Funky.csproj.FileListAbsolute.txt
	Funky/Funky/obj/Debug/Funky.csproj.GenerateResource.Cache
	Funky/Funky/obj/Debug/Funky.csprojResolveAssemblyReference.cache
	Funky/Funky/obj/Debug/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/obj/Debug/SharpDX Toolkit WinRT (XAML).pdb
	Funky/Funky/obj/Debug/intermediatexaml/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/obj/Debug/pri.resfiles
	Funky/Funky/obj/Debug/pri.resfiles.intermediate
	Funky/Funky/objLoader.cs