cc
Merge branch 'master' of https://github.com/chuzui/python_algorithm

Conflicts:
	opt/knapsack/solver.py