s3
Merge branch 'master' of github.com:jj4jj/leetcode

Conflicts:
	Solution3.h