Comi
Merge remote-tracking branch 'origin/master'

Conflicts:
	resource/notebook/relax/joke.txt