test .........
Merge branch 'master' of github.com:jerryjianjun/TupBuildSystem

Conflicts:
	Tupfile.lua
	Tuprules.lua
	init/Tupfile.lua