Fixed bugs
Increment version number
Merge branch 'master' of github.com:nekojarashi/zipping

Conflicts:
	VERSION