haha
Merge branch 'master' of https://github.com/hophacker/Jie

Conflicts:
	contestapplet_jie.conf