testy
Merge branch 'master' of https://github.com/skallet/CubeWorld

Conflicts:
	CubeWorldTrees.suo
	CubeWorldTrees/Program.cs
	CubeWorldTrees/Server/Client.cs
	CubeWorldTrees/bin/Debug/CubeWorldTrees.exe
	CubeWorldTrees/bin/Debug/CubeWorldTrees.pdb
	CubeWorldTrees/obj/x86/Debug/CubeWorldTrees.exe
	CubeWorldTrees/obj/x86/Debug/CubeWorldTrees.pdb