sdfs
Merge branch 'master' of github.com:fabletang/glmud

Conflicts:
	killer.tt