a
Merge branch 'master' of github.com:xingxux/image_compression

Conflicts:
	lib.py
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
iasdfasdf

Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression
Merge branch 'master' of github.com:xingxux/image_compression