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

Conflicts:
	Puzzle/ViewController.m