reorganized some things. Found the speeds of the npc
Merge branch 'master' into giang

Conflicts:
	gamemode/init.lua