Merge branch 'master' of https://github.com/Iyamoto/hh

Conflicts:
	b3.cmd
Merge branch 'master' of https://github.com/Iyamoto/hh

Conflicts:
	b3.cmd
	gen.cmd
	getFound.cmd
	pot.py
	todo.txt