lab 3 work in progress
Merge branch 'master' of https://github.com/rsliu/iOS-Programming-Samples

Conflicts:
	MochismoV2/MochismoV2.xcodeproj/project.xcworkspace/xcuserdata/rsliu.xcuserdatad/UserInterfaceState.xcuserstate
	MochismoV2/MochismoV2/Base.lproj/Main.storyboard