1
Merge branch 'master' of https://github.com/callzhang/LikedOrNope

Conflicts:
	LikedOrNope.xcworkspace/xcshareddata/LikedOrNope.xccheckout

LikedOrNope.xcworkspace/xcuserdata/Lee.xcuserdatad/UserInterfaceState.xc
userstate