Add xml jokes with 2-part
Merge remote-tracking branch '2-part/2-part' into 1-part

Conflicts:
	jokes.xml