first commit
Merge branch 'master' of https://github.com/miyagi389/zip-python

Conflicts:
	fabfile.py