。。。
Merge branch 'master' of https://github.com/JiaoLiu/GoldenRuler

Conflicts:
	金标尺.xcworkspace/xcshareddata/金标尺.xccheckout