upload to pypi
Merge branch 'master' of https://github.com/pc-zhang/sorting

Conflicts:
	.gitignore