Resize to at most 1200x1600, don't add borders
Merge branch 'master' of github.com:skerit/epubify

Conflicts:
	epubify.js