commit
Merge branch 'master' of https://github.com/iamzhaozheng/leetcode.git

Conflicts:
	src/com/hisrv/leetcode/Main.java