1
Merge branch 'master' of https://github.com/zhaonana/LoveAnchor

Conflicts:
	LoveAnchor.xcodeproj/project.pbxproj