Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
use Warrior instead of Hero
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/main.lua
fixed conflicate
Merge pull request #10 from calfjohn/master

use Warrior instead of Hero