add some changes by mac
Merge branch 'master' of https://github.com/cloudmonkeypeng/LeetCode

Conflicts:
	Leetcode第二遍记录.txt