fixed up restructure
Merge branch 'master' of https://github.com/xenith-studios/ataxia

Conflicts:
	engine/player.go
	engine/server.go
	game/lua_accessors.go