Merge https://github.com/rleofield/libpngjpegz

Conflicts:
	.gitignore
Merge https://github.com/rleofield/libpngjpegz