Conflicts:
	MineSweeper.xcodeproj/project.xcworkspace/xcuserdata/Yuki.xcuserdatad/UserInterfaceState.xcuserstate
fixed conflicts
Merge branch 'master' of https://github.com/y-tomiyoshi/MineSweeper