test
Initial changes for brain project, including 3D graph support.
Nothing...
Merge branch 'master' of https://github.com/tgdwyer/WebCola

Conflicts:
	Gruntfile.js
	WebCola/WebCola.csproj
	WebCola/WebCola.csproj.user
	WebCola/bin/WebCola.dll
	WebCola/bin/WebCola.pdb
	WebCola/cola.v1.min.js
	WebCola/examples/brain3d.html
	WebCola/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WebCola/obj/Debug/WebCola.csproj.FileListAbsolute.txt
	WebCola/obj/Debug/WebCola.dll
	WebCola/obj/Debug/WebCola.pdb
	WebCola/src/descent.js
	WebCola/src/descent.js.map
	WebCola/src/descent.ts
Fixed cola.min.js
Merge pull request #2 from ecl3ctic/master

Merge my initial work, hopefully not break anything