remove trailing whitespace
Merge branch 'master' of github.com:paulschreiber/pdf-merger

Conflicts:
	lib/pdf/merger/jruby.rb