I might be breaking everythinggggggggg
Merge branch 'master' of github.com:melaniecebula/voxel-server
"stuffs?"
www/skin2.png
"stuffs"
Merge branch 'master' of github.com:melaniecebula/voxel-server
stuffs
stuffs
Merge branch 'master' of github.com:melaniecebula/voxel-server

Conflicts:
	client.js
	server.js