123
Merge branch 'master' of
https://github.com/jingguofeng/datastructure.git

Conflicts:
	datastructure/.gitignore