test
Merge branch 'master' of https://github.com/ldsea/LearnStanford

Conflicts:

Attributor/Attributor.xcodeproj/project.xcworkspace/xcuserdata/ldsea.xcu
serdatad/UserInterfaceState.xcuserstate
	Attributor/Attributor/Base.lproj/Main.storyboard