score
Merge branch 'master' of https://github.com/Azerom/hanjje
Merge branch 'master' of https://github.com/Azerom/hanjje

Conflicts:
	hanjie.c
Merge branch 'master' of https://github.com/Azerom/hanjje
fini