modified:   main.cpp
	modified:   main.hpp
	modified:   mobi/compression/compression.cpp
	modified:   mobi/compression/compression.hpp
	modified:   mobi/mobi.cpp
	modified:   mobi/mobi.hpp
	modified:   mobi/mobi_headers_handler.hpp
Merge branch 'master' of https://github.com/dipeptyd/mobi2epub

Conflicts:
	mobi/mobi_headers_handler.hpp

	modified:   epub/epub.cpp
	modified:   epub/epub.hpp
	modified:   mobi/mobi_headers_handler.cpp
	modified:   mobi/mobi_headers_handler.hpp