Links on jokes and facts
Merge remote-tracking branch 'origin/master'

Conflicts:
	rss.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	rss.xml