add back a (simpler) FontTest
Merge branch 'master' of github.com:zhouyan/pkgcomp

Conflicts:
	FontTest.lua