confilit for 1
Merge branch 'master' of https://github.com/yuhaos/leetcode

Conflicts:
	test_git_branch2