edit
Merge branch 'master' of https://github.com/nmtsylla/pymanga

Conflicts:
	function.py
updata