merge
Merge branch 'master' of https://github.com/hearimm/GoldenRatio

Conflicts:
	GoldenSection.xcodeproj/project.pbxproj

GoldenSection.xcodeproj/project.xcworkspace/xcuserdata/Hyuky.xcuserdatad
/UserInterfaceState.xcuserstate