home computer commit
Merge branch 'master' of https://github.com/zejun/LeetCode.git

Conflicts:
	bin/com/test/Test.class
	src/com/test/Test.java