Revert "Merge branch 'master' of https://github.com/ligun123/Puzzle"

This reverts commit e36e4b005918944c14480fe30c35df3668d1c6cb, reversing
changes made to 374ef2f568b77732b2200a57de1502d0f81f51b3.
Revert "o2 puz"

This reverts commit 374ef2f568b77732b2200a57de1502d0f81f51b3.

Conflicts:

Puzzle.xcodeproj/project.xcworkspace/xcuserdata/li376438624.xcuserdatad/
UserInterfaceState.xcuserstate