Added stuff, textured stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/net/condorcraft110/stygian/core/ClientProxy.class
	bin/net/condorcraft110/stygian/core/CommonProxy.class
	bin/net/condorcraft110/stygian/core/Stygian.class
	src/main/java/net/condorcraft110/stygian/core/ClientProxy.java