Epub is a media file in dired
Update custom
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	files/emacs-custom.el