perlin on matts branch
fuckin around
removed vpl and consolodated the normal and hitpoint
Merge commit '478ed1d356c1a2a2fab3e56bd334aed4e53a0b7d'

Conflicts:
	Funky/Funky.v11.suo
	Funky/Funky/Funky.csproj
	Funky/Funky/RayTracer.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/App.g.cs
	Funky/Funky/obj/Debug/App.g.i.cs
	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/MainPage.g.cs
	Funky/Funky/obj/Debug/MainPage.g.i.cs
	Funky/Funky/obj/Debug/ProjectArchitectures.txt
	Funky/Funky/obj/Debug/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/obj/Debug/SharpDX Toolkit WinRT (XAML).pdb
	Funky/Funky/obj/Debug/SharpDX/Resources.resfiles
	Funky/Funky/obj/Debug/intermediatexaml/SharpDX Toolkit WinRT (XAML).exe
	Funky/Funky/obj/Debug/intermediatexaml/SharpDX Toolkit WinRT (XAML).pdb
	Funky/Funky/obj/Debug/pri.resfiles
	Funky/Funky/obj/Debug/pri.resfiles.intermediate