add a timer
 solve conflict
Merge branch 'timer'

Conflicts:

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