o2 puz
Merge branch 'master' of https://github.com/ligun123/Puzzle

Conflicts:
	Puzzle.xcodeproj/project.pbxproj