Merge branch 'menu'

Conflicts:

mine-sweeper/mine-sweeper.xcodeproj/project.xcworkspace/xcuserdata/yangl
1996.xcuserdatad/UserInterfaceState.xcuserstate
	mine-sweeper/mine-sweeper/main.cpp